1 files changed, 10 insertions, 7 deletions

diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index a7e9b96f258a..7ba0447d6fa3 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -279,7 +279,7 @@ static void mainstone_backlight_power(int on)
         }
 }
 
-static struct pxafb_mach_info toshiba_ltm04c380k __initdata = {
+static struct pxafb_mode_info toshiba_ltm04c380k_mode = {
         .pixclock               = 50000,
         .xres                   = 640,
         .yres                   = 480,
@@ -291,12 +291,9 @@ static struct pxafb_mach_info toshiba_ltm04c380k __initdata = {
         .upper_margin           = 0,
         .lower_margin           = 0,
         .sync                   = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
-        .lccr0                  = LCCR0_Act,
-        .lccr3                  = LCCR3_PCP,
-        .pxafb_backlight_power  = mainstone_backlight_power,
 };
 
-static struct pxafb_mach_info toshiba_ltm035a776c __initdata = {
+static struct pxafb_mode_info toshiba_ltm035a776c_mode = {
         .pixclock               = 110000,
         .xres                   = 240,
         .yres                   = 320,
@@ -308,6 +305,10 @@ static struct pxafb_mach_info toshiba_ltm035a776c __initdata = {
         .upper_margin           = 1,
         .lower_margin           = 10,
         .sync                   = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct pxafb_mach_info mainstone_pxafb_info = {
+        .num_modes              = 1,
         .lccr0                  = LCCR0_Act,
         .lccr3                  = LCCR3_PCP,
         .pxafb_backlight_power  = mainstone_backlight_power,
@@ -448,9 +449,11 @@ static void __init mainstone_init(void)
         /* reading Mainstone's "Virtual Configuration Register"
            might be handy to select LCD type here */
         if (0)
-                set_pxa_fb_info(&toshiba_ltm04c380k);
+                mainstone_pxafb_info.modes = &toshiba_ltm04c380k_mode;
         else
-                set_pxa_fb_info(&toshiba_ltm035a776c);
+                mainstone_pxafb_info.modes = &toshiba_ltm035a776c_mode;
+
+        set_pxa_fb_info(&mainstone_pxafb_info);
 
         pxa_set_mci_info(&mainstone_mci_platform_data);
         pxa_set_ficp_info(&mainstone_ficp_platform_data);