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

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-omap1 / board-palmz71.c

diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index b21df2f1cf8264724444b7b7bba467751351157f..a2c5abcd7c84e56d53c441059cf526294883c294 100644 (file)
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -27,6 +27,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
+#include <linux/omapfb.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
@@ -239,10 +240,6 @@ static struct omap_lcd_config palmz71_lcd_config __initdata = {
        .ctrl_name = "internal",
 };
 
-static struct omap_board_config_kernel palmz71_config[] __initdata = {
-       {OMAP_TAG_LCD,  &palmz71_lcd_config},
-};
-
 static irqreturn_t
 palmz71_powercable(int irq, void *dev_id)
 {
@@ -313,9 +310,6 @@ omap_palmz71_init(void)
        palmz71_gpio_setup(1);
        omap_mpu_wdt_mode(0);
 
-       omap_board_config = palmz71_config;
-       omap_board_config_size = ARRAY_SIZE(palmz71_config);
-
        platform_add_devices(devices, ARRAY_SIZE(devices));
 
        palmz71_boardinfo[0].irq = gpio_to_irq(PALMZ71_PENIRQ_GPIO);
@@ -325,6 +319,8 @@ omap_palmz71_init(void)
        omap_serial_init();
        omap_register_i2c_bus(1, 100, NULL, 0);
        palmz71_gpio_setup(0);
+
+       omapfb_set_lcd_config(&palmz71_lcd_config);
 }
 
 MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71")