[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Andy Green]

The following commit has been merged in the andy-tracking branch:
commit 1230bcc9fc7c72b63726731e1df8fd600dbfe96c
Author: Andy Green <andy at openmoko.com>
Date:   Wed Mar 4 15:05:41 2009 +0000

    config-3d7k-correct-alsa-driver-name.patch
    
    Signed-off-by: Andy Green <andy at openmoko.com>

diff --git a/arch/arm/configs/om_3d7k_defconfig b/arch/arm/configs/om_3d7k_defconfig
index 04dd3fa..06c6172 100644
--- a/arch/arm/configs/om_3d7k_defconfig
+++ b/arch/arm/configs/om_3d7k_defconfig
@@ -1120,6 +1120,7 @@ CONFIG_SND_S3C24XX_SOC=y
 # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
 # CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
 # CONFIG_SND_S3C64XX_SOC_SMDK6410_WM8731 is not set
+CONFIG_SND_S3C24XX_SOC_OM_3D7K_WM8753=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index 9881652..5466ecc 100644
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -53,8 +53,8 @@ config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753
 	  with the WM8753 codec
 
 config SND_S3C24XX_SOC_OM_3D7K_WM8753
-	tristate "SoC I2S Audio support for OM GTA03 - WM8753"
-	depends on SND_S3C24XX_SOC && MACH_OPENMOKO_GTA03
+	tristate "SoC I2S Audio support for OM 3D7K - WM8753"
+	depends on SND_S3C24XX_SOC && MACH_OM_3D7K
 	select SND_S3C64XX_SOC_I2S
 	select SND_SOC_WM8753
 	help
diff --git a/sound/soc/s3c24xx/om_3d7k_wm8753.c b/sound/soc/s3c24xx/om_3d7k_wm8753.c
index 8a823f1..840ac8f 100644
--- a/sound/soc/s3c24xx/om_3d7k_wm8753.c
+++ b/sound/soc/s3c24xx/om_3d7k_wm8753.c
@@ -528,7 +528,7 @@ static int __init om_3d7K_init(void)
 {
 	int ret;
 
-	if (!machine_is_openmoko_gta03()) {
+	if (!machine_is_om_3d7k()) {
 		printk(KERN_INFO "Only 3D7K supported by ASoC driver\n");
 		return -ENODEV;
 	}

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko