From: Jonas Gorski <jogo@openwrt.org>
Date: Sat, 4 Jul 2015 12:52:57 +0000 (+0000)
Subject: kernel: kmod-scsi-core: fix load on install
X-Git-Tag: reboot~2635
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=090686ac1fe031d7c21321f74c470930a888c8e0;p=openwrt%2Fstaging%2Fxback.git

kernel: kmod-scsi-core: fix load on install

sd_mod depends on scsi_mod, but due to it being an AutoLoad and not
AutoProbe module, it was not loading when installing the package,
causing unknown symbol errors for sd_mod and anything depending on it.

Closes #14927, #18293, #19351.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46176
---

diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk
index afa0cd3349..ccbb0805c8 100644
--- a/package/kernel/linux/modules/block.mk
+++ b/package/kernel/linux/modules/block.mk
@@ -616,9 +616,9 @@ define KernelPackage/scsi-core
 	CONFIG_SCSI \
 	CONFIG_BLK_DEV_SD
   FILES:= \
-	$(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.ko) \
+	$(LINUX_DIR)/drivers/scsi/scsi_mod.ko \
 	$(LINUX_DIR)/drivers/scsi/sd_mod.ko
-  AUTOLOAD:=$(call AutoLoad,40,sd_mod,1)
+  AUTOLOAD:=$(call AutoLoad,40,scsi_mod sd_mod,1)
 endef
 
 $(eval $(call KernelPackage,scsi-core))