diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-perseus2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index c000bed76276..44df93172653 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/mtd/physmap.h> | 21 | #include <linux/mtd/physmap.h> |
22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
23 | #include <linux/smc91x.h> | 23 | #include <linux/smc91x.h> |
24 | #include <linux/omapfb.h> | ||
24 | 25 | ||
25 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
26 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
@@ -249,10 +250,6 @@ static struct omap_lcd_config perseus2_lcd_config __initdata = { | |||
249 | .ctrl_name = "internal", | 250 | .ctrl_name = "internal", |
250 | }; | 251 | }; |
251 | 252 | ||
252 | static struct omap_board_config_kernel perseus2_config[] __initdata = { | ||
253 | { OMAP_TAG_LCD, &perseus2_lcd_config }, | ||
254 | }; | ||
255 | |||
256 | static void __init perseus2_init_smc91x(void) | 253 | static void __init perseus2_init_smc91x(void) |
257 | { | 254 | { |
258 | fpga_write(1, H2P2_DBG_FPGA_LAN_RESET); | 255 | fpga_write(1, H2P2_DBG_FPGA_LAN_RESET); |
@@ -320,10 +317,10 @@ static void __init omap_perseus2_init(void) | |||
320 | 317 | ||
321 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 318 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
322 | 319 | ||
323 | omap_board_config = perseus2_config; | ||
324 | omap_board_config_size = ARRAY_SIZE(perseus2_config); | ||
325 | omap_serial_init(); | 320 | omap_serial_init(); |
326 | omap_register_i2c_bus(1, 100, NULL, 0); | 321 | omap_register_i2c_bus(1, 100, NULL, 0); |
322 | |||
323 | omapfb_set_lcd_config(&perseus2_lcd_config); | ||
327 | } | 324 | } |
328 | 325 | ||
329 | /* Only FPGA needs to be mapped here. All others are done with ioremap */ | 326 | /* Only FPGA needs to be mapped here. All others are done with ioremap */ |