diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 19bcd004d60..a1faea3b776 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -228,14 +228,6 @@ static struct omap_dss_board_info beagle_dss_data = { | |||
228 | .default_device = &beagle_dvi_device, | 228 | .default_device = &beagle_dvi_device, |
229 | }; | 229 | }; |
230 | 230 | ||
231 | static struct platform_device beagle_dss_device = { | ||
232 | .name = "omapdss", | ||
233 | .id = -1, | ||
234 | .dev = { | ||
235 | .platform_data = &beagle_dss_data, | ||
236 | }, | ||
237 | }; | ||
238 | |||
239 | static struct regulator_consumer_supply beagle_vdac_supply = | 231 | static struct regulator_consumer_supply beagle_vdac_supply = |
240 | REGULATOR_SUPPLY("vdda_dac", "omapdss"); | 232 | REGULATOR_SUPPLY("vdda_dac", "omapdss"); |
241 | 233 | ||
@@ -554,7 +546,6 @@ static void __init omap3_beagle_init_irq(void) | |||
554 | static struct platform_device *omap3_beagle_devices[] __initdata = { | 546 | static struct platform_device *omap3_beagle_devices[] __initdata = { |
555 | &leds_gpio, | 547 | &leds_gpio, |
556 | &keys_gpio, | 548 | &keys_gpio, |
557 | &beagle_dss_device, | ||
558 | }; | 549 | }; |
559 | 550 | ||
560 | static void __init omap3beagle_flash_init(void) | 551 | static void __init omap3beagle_flash_init(void) |
@@ -621,6 +612,7 @@ static void __init omap3_beagle_init(void) | |||
621 | omap3_beagle_i2c_init(); | 612 | omap3_beagle_i2c_init(); |
622 | platform_add_devices(omap3_beagle_devices, | 613 | platform_add_devices(omap3_beagle_devices, |
623 | ARRAY_SIZE(omap3_beagle_devices)); | 614 | ARRAY_SIZE(omap3_beagle_devices)); |
615 | omap_display_init(&beagle_dss_data); | ||
624 | omap_serial_init(); | 616 | omap_serial_init(); |
625 | 617 | ||
626 | omap_mux_init_gpio(170, OMAP_PIN_INPUT); | 618 | omap_mux_init_gpio(170, OMAP_PIN_INPUT); |