[ARM] Merge most of the PXA work for initial merge

[safe/jmp/linux-2.6] / arch / arm / mach-pxa / cm-x270.c

diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index f5851d1..01b9964 100644 (file)
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -31,6 +31,7 @@
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/pxa2xx-regs.h>
 #include <asm/arch/pxa2xx-gpio.h>
+#include <asm/arch/audio.h>
 #include <asm/arch/pxafb.h>
 #include <asm/arch/ohci.h>
 #include <asm/arch/mmc.h>
@@ -81,12 +82,6 @@ static struct platform_device cmx270_device_dm9k = {
        }
 };
 
-/* audio device */
-static struct platform_device cmx270_audio_device = {
-       .name           = "pxa2xx-ac97",
-       .id             = -1,
-};
-
 /* touchscreen controller */
 static struct platform_device cmx270_ts_device = {
        .name           = "ucb1400_ts",
@@ -219,7 +214,6 @@ static struct platform_device cmx270_ata = {
 /* platform devices */
 static struct platform_device *platform_devices[] __initdata = {
        &cmx270_device_dm9k,
-       &cmx270_audio_device,
        &cmx270_rtc_device,
        &cmx270_2700G,
        &cmx270_led_device,
@@ -594,6 +588,7 @@ static void __init cmx270_init(void)
 
        /* register CM-X270 platform devices */
        platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+       pxa_set_ac97_info(NULL);
 
        /* set MCI and OHCI platform parameters */
        pxa_set_mci_info(&cmx270_mci_platform_data);