Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / arch / arm / mach-shmobile / board-ag5evm.c

diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index bd7953b59a8467913a123057a8008576b58cb201..f50d7c8b1221bc2f9b32b6b3a0414d43a485c2ce 100644 (file)
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -228,16 +228,6 @@ static void lcd_backlight_reset(void)
        gpio_set_value(GPIO_PORT235, 1);
 }
 
-static void lcd_on(void *board_data, struct fb_info *info)
-{
-       lcd_backlight_on();
-}
-
-static void lcd_off(void *board_data)
-{
-       lcd_backlight_reset();
-}
-
 /* LCDC0 */
 static const struct fb_videomode lcdc0_modes[] = {
        {
@@ -261,14 +251,14 @@ static struct sh_mobile_lcdc_info lcdc0_info = {
                .interface_type = RGB24,
                .clock_divider = 1,
                .flags = LCDC_FLAGS_DWPOL,
-               .lcd_size_cfg.width = 44,
-               .lcd_size_cfg.height = 79,
                .fourcc = V4L2_PIX_FMT_RGB565,
-               .lcd_cfg = lcdc0_modes,
-               .num_cfg = ARRAY_SIZE(lcdc0_modes),
-               .board_cfg = {
-                       .display_on = lcd_on,
-                       .display_off = lcd_off,
+               .lcd_modes = lcdc0_modes,
+               .num_modes = ARRAY_SIZE(lcdc0_modes),
+               .panel_cfg = {
+                       .width = 44,
+                       .height = 79,
+                       .display_on = lcd_backlight_on,
+                       .display_off = lcd_backlight_reset,
                },
        }
 };