diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-fsample.c')
-rw-r--r-- | arch/arm/mach-omap1/board-fsample.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 0b9464b41212..b00844f7414d 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.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> |
@@ -290,10 +291,6 @@ static struct omap_lcd_config fsample_lcd_config = { | |||
290 | .ctrl_name = "internal", | 291 | .ctrl_name = "internal", |
291 | }; | 292 | }; |
292 | 293 | ||
293 | static struct omap_board_config_kernel fsample_config[] __initdata = { | ||
294 | { OMAP_TAG_LCD, &fsample_lcd_config }, | ||
295 | }; | ||
296 | |||
297 | static void __init omap_fsample_init(void) | 294 | static void __init omap_fsample_init(void) |
298 | { | 295 | { |
299 | /* Early, board-dependent init */ | 296 | /* Early, board-dependent init */ |
@@ -352,10 +349,10 @@ static void __init omap_fsample_init(void) | |||
352 | 349 | ||
353 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 350 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
354 | 351 | ||
355 | omap_board_config = fsample_config; | ||
356 | omap_board_config_size = ARRAY_SIZE(fsample_config); | ||
357 | omap_serial_init(); | 352 | omap_serial_init(); |
358 | omap_register_i2c_bus(1, 100, NULL, 0); | 353 | omap_register_i2c_bus(1, 100, NULL, 0); |
354 | |||
355 | omapfb_set_lcd_config(&fsample_lcd_config); | ||
359 | } | 356 | } |
360 | 357 | ||
361 | /* Only FPGA needs to be mapped here. All others are done with ioremap */ | 358 | /* Only FPGA needs to be mapped here. All others are done with ioremap */ |