[source] linux: do not autoload sdhci.ko as sdhci-pltfm.ko already depends on it

LEDE Commits lede-commits at lists.infradead.org
Wed Dec 14 09:41:24 PST 2016


jow pushed a commit to source.git, branch master:
https://git.lede-project.org/3494ca66c5aa800f28577cb3849d48a710de8cd0

commit 3494ca66c5aa800f28577cb3849d48a710de8cd0
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Tue Dec 6 17:09:34 2016 +0100

    linux: do not autoload sdhci.ko as sdhci-pltfm.ko already depends on it
    
    Currently, installing kmod-sdhci fails with "sdhci is already loaded" since
    "sdhci.ko" is inserted explicitely first, the implicitely loaded again when
    "sdhci-pltfm.ko" is inserted as the latter depends on the former.
    
    Remove the explicit autoprobe of "sdhci.ko" to fix the postinstall script.
    
    Acked-by: John Crispin <john at phrozen.org>
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 package/kernel/linux/modules/other.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index c22f572..0c96969 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -384,7 +384,7 @@ define KernelPackage/sdhci
 	$(LINUX_DIR)/drivers/mmc/host/sdhci.ko \
 	$(LINUX_DIR)/drivers/mmc/host/sdhci-pltfm.ko
 
-  AUTOLOAD:=$(call AutoProbe,sdhci sdhci-pltfm,1)
+  AUTOLOAD:=$(call AutoProbe,sdhci-pltfm,1)
 endef
 
 define KernelPackage/sdhci/description



More information about the lede-commits mailing list