REMOVE OMAP LEGACY CODE: Reset clocks and PM code to mainline

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800.c

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 60a414cae71f6a447ea3f53f4aa5794dc529867b..f1552f0d7b61948e921ed8e94422a8f0a9ddef6f 100644 (file)
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -41,6 +41,7 @@
 #include <mach/gpio-switch.h>
 #include <mach/omapfb.h>
 #include <mach/blizzard.h>
+#include <mach/board-nokia.h>
 
 #include <../drivers/cbus/tahvo.h>
 #include <../drivers/media/video/tcm825x.h>
@@ -568,10 +569,20 @@ static struct omap_gpio_switch n800_gpio_switches[] __initdata = {
        },
 };
 
+#if defined(CONFIG_CBUS_RETU_HEADSET)
+static struct platform_device retu_headset_device = {
+       .name   = "retu-headset",
+       .id     = -1,
+};
+#endif
+
 static struct platform_device *n800_devices[] __initdata = {
 #if defined(CONFIG_CBUS_RETU) && defined(CONFIG_LEDS_OMAP_PWM)
        &n800_keypad_led_device,
 #endif
+#if defined(CONFIG_CBUS_RETU_HEADSET)
+       &retu_headset_device,
+#endif
 };
 
 #ifdef CONFIG_MENELAUS
@@ -712,7 +723,6 @@ static void __init nokia_n800_init(void)
 {
        nokia_n800_common_init();
 
-       n800_audio_init(&tsc2301_config);
        n800_ts_set_config();
        tsc2301_dev_init();
        tea5761_dev_init();