Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / arm / mach-omap2 / board-rx51-video.c

diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index acd6700..89a66db 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -66,18 +66,6 @@ static struct omap_dss_board_info rx51_dss_board_info = {
        .default_device = &rx51_lcd_device,
 };
 
-struct platform_device rx51_display_device = {
-       .name   = "omapdss",
-       .id     = -1,
-       .dev    = {
-               .platform_data = &rx51_dss_board_info,
-       },
-};
-
-static struct platform_device *rx51_video_devices[] __initdata = {
-       &rx51_display_device,
-};
-
 static int __init rx51_video_init(void)
 {
        if (!machine_is_nokia_rx51())
@@ -95,8 +83,7 @@ static int __init rx51_video_init(void)
 
        gpio_direction_output(RX51_LCD_RESET_GPIO, 1);
 
-       platform_add_devices(rx51_video_devices,
-                               ARRAY_SIZE(rx51_video_devices));
+       omap_display_init(&rx51_dss_board_info);
        return 0;
 }