[oe-commits] Klaus Kurzmann : linux-openmoko.inc: move autoload of sound modules to the appropriate machine config

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: d3e271f9dc36cb6f7ba5ee96cc93ab5597da1a44
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d3e271f9dc36cb6f7ba5ee96cc93ab5597da1a44

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Thu Nov  5 10:25:33 2009 +0100

linux-openmoko.inc: move autoload of sound modules to the appropriate machine config

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/machine/om-gta01.conf       |    2 ++
 conf/machine/om-gta02.conf       |    2 ++
 recipes/linux/linux-openmoko.inc |    6 ------
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 017530e..b0b14c8 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -42,6 +42,8 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "dfu-util-native"
 
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
 
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 79f64c8..51badd6 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -61,5 +61,7 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
+module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
+
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
diff --git a/recipes/linux/linux-openmoko.inc b/recipes/linux/linux-openmoko.inc
index 84a77ea..6fe3c0e 100644
--- a/recipes/linux/linux-openmoko.inc
+++ b/recipes/linux/linux-openmoko.inc
@@ -28,12 +28,6 @@ THUMB_INTERWORKING = "no"
 module_autoload_ohci-hcd = "ohci-hcd"
 module_autoload_hci_usb = "hci_usb"
 module_autoload_g_ether = "g_ether"
-# audio (GTA01)
-module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
-# audio (GTA02)
-module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
-# audio (GTA03)
-module_autoload_snd-soc-neo1973-gta02-wm8753 = ""
 # sd/mmc
 module_autoload_s3cmci = "s3cmci"