diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 9c63c37b500e..07006c323fc2 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -240,14 +240,6 @@ static struct omap_dss_board_info omap3_stalker_dss_data = { | |||
240 | .default_device = &omap3_stalker_dvi_device, | 240 | .default_device = &omap3_stalker_dvi_device, |
241 | }; | 241 | }; |
242 | 242 | ||
243 | static struct platform_device omap3_stalker_dss_device = { | ||
244 | .name = "omapdss", | ||
245 | .id = -1, | ||
246 | .dev = { | ||
247 | .platform_data = &omap3_stalker_dss_data, | ||
248 | }, | ||
249 | }; | ||
250 | |||
251 | static struct regulator_consumer_supply omap3stalker_vmmc1_supply = { | 243 | static struct regulator_consumer_supply omap3stalker_vmmc1_supply = { |
252 | .supply = "vmmc", | 244 | .supply = "vmmc", |
253 | }; | 245 | }; |
@@ -604,7 +596,6 @@ static void __init omap3_stalker_init_irq(void) | |||
604 | } | 596 | } |
605 | 597 | ||
606 | static struct platform_device *omap3_stalker_devices[] __initdata = { | 598 | static struct platform_device *omap3_stalker_devices[] __initdata = { |
607 | &omap3_stalker_dss_device, | ||
608 | &keys_gpio, | 599 | &keys_gpio, |
609 | }; | 600 | }; |
610 | 601 | ||
@@ -644,6 +635,7 @@ static void __init omap3_stalker_init(void) | |||
644 | platform_add_devices(omap3_stalker_devices, | 635 | platform_add_devices(omap3_stalker_devices, |
645 | ARRAY_SIZE(omap3_stalker_devices)); | 636 | ARRAY_SIZE(omap3_stalker_devices)); |
646 | 637 | ||
638 | omap_display_init(&omap3_stalker_dss_data); | ||
647 | spi_register_board_info(omap3stalker_spi_board_info, | 639 | spi_register_board_info(omap3stalker_spi_board_info, |
648 | ARRAY_SIZE(omap3stalker_spi_board_info)); | 640 | ARRAY_SIZE(omap3stalker_spi_board_info)); |
649 | 641 | ||