Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6

[karo-tx-linux.git] / arch / sh / boards / mach-se / 7724 / setup.c

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 59f4db829e91be6b745acd0f7cccc525d8ef60b0..c540b16547c31c4f0608e86a2078c00fdc0d80f7 100644 (file)
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -182,12 +182,10 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                .chan = LCDC_CHAN_MAINLCD,
                .fourcc = V4L2_PIX_FMT_RGB565,
                .clock_divider = 1,
-               .lcd_size_cfg = { /* 7.0 inch */
+               .panel_cfg = { /* 7.0 inch */
                        .width = 152,
                        .height = 91,
                },
-               .board_cfg = {
-               },
        }
 };
 
@@ -890,12 +888,12 @@ static int __init devices_setup(void)
 
        if (sw & SW41_B) {
                /* 720p */
-               lcdc_info.ch[0].lcd_cfg = lcdc_720p_modes;
-               lcdc_info.ch[0].num_cfg = ARRAY_SIZE(lcdc_720p_modes);
+               lcdc_info.ch[0].lcd_modes = lcdc_720p_modes;
+               lcdc_info.ch[0].num_modes = ARRAY_SIZE(lcdc_720p_modes);
        } else {
                /* VGA */
-               lcdc_info.ch[0].lcd_cfg = lcdc_vga_modes;
-               lcdc_info.ch[0].num_cfg = ARRAY_SIZE(lcdc_vga_modes);
+               lcdc_info.ch[0].lcd_modes = lcdc_vga_modes;
+               lcdc_info.ch[0].num_modes = ARRAY_SIZE(lcdc_vga_modes);
        }
 
        if (sw & SW41_A) {