From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 24 Jul 2012 19:43:15 +0000 (+0000)
Subject: fix sound modules loading order and dependencies
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c531ce030165d4c4f3349bb68e09539b6cf4beaf;p=openwrt%2Fstaging%2Fwigyori.git

fix sound modules loading order and dependencies

SVN-Revision: 32802
---

diff --git a/target/linux/ep93xx/modules.mk b/target/linux/ep93xx/modules.mk
index 94d2c83f82..8b7060ffc7 100644
--- a/target/linux/ep93xx/modules.mk
+++ b/target/linux/ep93xx/modules.mk
@@ -27,10 +27,10 @@ $(eval $(call KernelPackage,input-keyboard-ep93xx))
 define KernelPackage/sound-soc-ep93xx
   SUBMENU:=$(SOUND_MENU)
   TITLE:=EP93xx SoC sound support
-  DEPENDS:=@TARGET_ep93xx +kmod-sound-core +kmod-sound-soc-core
+  DEPENDS:=@TARGET_ep93xx +kmod-sound-soc-ac97
   KCONFIG:=CONFIG_SND_EP93XX_SOC
   FILES:=$(LINUX_DIR)/sound/soc/ep93xx/snd-soc-ep93xx.ko
-  AUTOLOAD:=$(call AutoLoad,56,snd-soc-ep93xx)
+  AUTOLOAD:=$(call AutoLoad,57,snd-soc-ep93xx)
 endef
 
 define KernelPackage/sound-soc-ep93xx/description
@@ -39,13 +39,15 @@ endef
 
 $(eval $(call KernelPackage,sound-soc-ep93xx))
 
+# Must be loaded prior to sound-soc-ac97 because it exports
+# soc_ac97_ops
 define KernelPackage/sound-soc-ep93xx-ac97
   SUBMENU:=$(SOUND_MENU)
   TITLE:=EP93xx SoC AC97 support
   DEPENDS:=+kmod-sound-soc-ep93xx
   KCONFIG:=CONFIG_SND_EP93XX_SOC_AC97
   FILES:=$(LINUX_DIR)/sound/soc/ep93xx/snd-soc-ep93xx-ac97.ko
-  AUTOLOAD:=$(call AutoLoad,57,snd-soc-ep93xx-ac97)
+  AUTOLOAD:=$(call AutoLoad,56,snd-soc-ep93xx-ac97)
 endef
 
 define KernelPackage/sound-soc-ep93xx-ac97/description
@@ -60,7 +62,7 @@ define KernelPackage/sound-soc-ep93xx-simone
   DEPENDS:=+kmod-sound-soc-ep93xx +kmod-sound-soc-ep93xx-ac97
   KCONFIG:=CONFIG_SND_EP93XX_SOC_SIMONE
   FILES:=$(LINUX_DIR)/sound/soc/ep93xx/snd-soc-simone.ko
-  AUTOLOAD:=$(call AutoLoad,57,snd-soc-ep93xx)
+  AUTOLOAD:=$(call AutoLoad,59,snd-soc-ep93xx)
 endef
 
 define KernelPackage/sound-soc-ep93xx-simone/description