Merge branch 'fixes-gpio-to-irq' into fixes

[pandora-kernel.git] / arch / arm / mach-omap1 / board-osk.c

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index a0c1a1c..a5f85dd 100644 (file)
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -34,6 +34,7 @@
 #include <linux/i2c.h>
 #include <linux/leds.h>
 #include <linux/smc91x.h>
+#include <linux/omapfb.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
@@ -294,12 +295,6 @@ static struct omap_lcd_config osk_lcd_config __initdata = {
 };
 #endif
 
-static struct omap_board_config_kernel osk_config[] __initdata = {
-#ifdef CONFIG_OMAP_OSK_MISTRAL
-       { OMAP_TAG_LCD,                 &osk_lcd_config },
-#endif
-};
-
 #ifdef CONFIG_OMAP_OSK_MISTRAL
 
 #include <linux/input.h>
@@ -547,8 +542,6 @@ static void __init osk_init(void)
        osk5912_cf_resources[0].start = gpio_to_irq(62);
        osk5912_cf_resources[0].end = gpio_to_irq(62);
        platform_add_devices(osk5912_devices, ARRAY_SIZE(osk5912_devices));
-       omap_board_config = osk_config;
-       omap_board_config_size = ARRAY_SIZE(osk_config);
 
        l = omap_readl(USB_TRANSCEIVER_CTRL);
        l |= (3 << 1);
@@ -566,6 +559,11 @@ static void __init osk_init(void)
        omap_register_i2c_bus(1, 400, osk_i2c_board_info,
                              ARRAY_SIZE(osk_i2c_board_info));
        osk_mistral_init();
+
+#ifdef CONFIG_OMAP_OSK_MISTRAL
+       omapfb_set_lcd_config(&osk_lcd_config);
+#endif
+
 }
 
 MACHINE_START(OMAP_OSK, "TI-OSK")