From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 16 Feb 2010 18:28:59 +0000 (+0000)
Subject: kernel: build the scsi core package even if CONFIG_SCSI=y
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=736f2a848d7247c0900b7131e13bea419bbf909f;p=15.05%2Fopenwrt.git

kernel: build the scsi core package even if CONFIG_SCSI=y

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19666 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 63791cf32e..1e6c1f2d4a 100644
--- 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