Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / arch / arm / mach-omap1 / board-perseus2.c

diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 83f5b765c5b69a187d47b103fb209886d9ed2865..76d4ee05a814783c9b12ecfb47bcfe9e5d43dc05 100644 (file)
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -21,6 +21,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
 #include <linux/smc91x.h>
+#include <linux/omapfb.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -235,27 +236,17 @@ static struct platform_device kp_device = {
        .resource       = kp_resources,
 };
 
-static struct platform_device lcd_device = {
-       .name           = "lcd_p2",
-       .id             = -1,
-};
-
 static struct platform_device *devices[] __initdata = {
        &nor_device,
        &nand_device,
        &smc91x_device,
        &kp_device,
-       &lcd_device,
 };
 
 static struct omap_lcd_config perseus2_lcd_config __initdata = {
        .ctrl_name      = "internal",
 };
 
-static struct omap_board_config_kernel perseus2_config[] __initdata = {
-       { OMAP_TAG_LCD,         &perseus2_lcd_config },
-};
-
 static void __init perseus2_init_smc91x(void)
 {
        fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);
@@ -323,10 +314,10 @@ static void __init omap_perseus2_init(void)
 
        platform_add_devices(devices, ARRAY_SIZE(devices));
 
-       omap_board_config = perseus2_config;
-       omap_board_config_size = ARRAY_SIZE(perseus2_config);
        omap_serial_init();
        omap_register_i2c_bus(1, 100, NULL, 0);
+
+       omapfb_set_lcd_config(&perseus2_lcd_config);
 }
 
 /* Only FPGA needs to be mapped here. All others are done with ioremap */