kernel: build the scsi core package even if CONFIG_SCSI=y
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 16 Feb 2010 18:28:59 +0000 (18:28 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 16 Feb 2010 18:28:59 +0000 (18:28 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19666 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/kernel/modules/block.mk

index 63791cf..1e6c1f2 100644 (file)
@@ -321,7 +321,7 @@ define KernelPackage/scsi-core
        CONFIG_SCSI \
        CONFIG_BLK_DEV_SD
   FILES:= \
-       $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+       $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX)) \
        $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,scsi_mod) $(call AutoLoad,40,sd_mod)
 endef