projects / librecmc / librecmc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 19d6a9c)
kernel: build the scsi core package even if CONFIG_SCSI=y
authorFelix Fietkau <nbd@openwrt.org>
Tue, 16 Feb 2010 18:28:59 +0000 (18:28 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 16 Feb 2010 18:28:59 +0000 (18:28 +0000)
SVN-Revision: 19666

package/kernel/modules/block.mk patch | blob | history

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 63791cf32ec2cbff82313ed265cd6429cddb8ee5..1e6c1f2d4a6191a0701fd666bdf409352d6cacf3 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -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