aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-07-04 12:52:57 +0000
committerJonas Gorski <jogo@openwrt.org>2015-07-04 12:52:57 +0000
commit090686ac1fe031d7c21321f74c470930a888c8e0 (patch)
treef93cbae5070c2b2e62c9f95131be69efb161dfd6
parent97db107703dff064027edf037c670890ecb21bff (diff)
downloadupstream-090686ac1fe031d7c21321f74c470930a888c8e0.tar.gz
upstream-090686ac1fe031d7c21321f74c470930a888c8e0.tar.bz2
upstream-090686ac1fe031d7c21321f74c470930a888c8e0.zip
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
-rw-r--r--package/kernel/linux/modules/block.mk4
1 files changed, 2 insertions, 2 deletions
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))