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

[linux-2.6-block.git] / arch / arm / mach-omap1 / board-palmtt.c

diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index fa9ce9ce92d430a0a081b9f2295dc91a2d1a910c..8d854878547be0fcdcc77e9e539b3d819d33ae97 100644 (file)
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -24,6 +24,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/leds.h>
+#include <linux/omapfb.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
@@ -273,10 +274,6 @@ static struct omap_lcd_config palmtt_lcd_config __initdata = {
        .ctrl_name      = "internal",
 };
 
-static struct omap_board_config_kernel palmtt_config[] __initdata = {
-       { OMAP_TAG_LCD,         &palmtt_lcd_config      },
-};
-
 static void __init omap_mpu_wdt_mode(int mode) {
        if (mode)
                omap_writew(0x8000, OMAP_WDT_TIMER_MODE);
@@ -298,9 +295,6 @@ static void __init omap_palmtt_init(void)
 
        omap_mpu_wdt_mode(0);
 
-       omap_board_config = palmtt_config;
-       omap_board_config_size = ARRAY_SIZE(palmtt_config);
-
        platform_add_devices(palmtt_devices, ARRAY_SIZE(palmtt_devices));
 
        palmtt_boardinfo[0].irq = gpio_to_irq(6);
@@ -308,6 +302,8 @@ static void __init omap_palmtt_init(void)
        omap_serial_init();
        omap1_usb_init(&palmtt_usb_config);
        omap_register_i2c_bus(1, 100, NULL, 0);
+
+       omapfb_set_lcd_config(&palmtt_lcd_config);
 }
 
 MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T")