Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / arch / arm / mach-pxa / trizeps4.c

diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 7c3007df1bd6e22be0c009dd796b5cf69bb89f11..910571e9a190cba0597219ce523c7c97a7525e7d 100644 (file)
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -368,7 +368,7 @@ static struct map_desc trizeps4_io_desc[] __initdata = {
        }
 };
 
-static struct pxafb_mach_info sharp_lcd __initdata = {
+static struct pxafb_mode_info sharp_lcd_mode = {
     .pixclock          = 78000,
     .xres              = 640,
     .yres              = 480,
@@ -381,6 +381,11 @@ static struct pxafb_mach_info sharp_lcd __initdata = {
     .lower_margin      = 0,
     .sync              = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
     .cmap_greyscale    = 0,
+};
+
+static struct pxafb_mach_info sharp_lcd = {
+    .modes             = &sharp_lcd_mode,
+    .num_modes = 1,
     .cmap_inverse      = 0,
     .cmap_static       = 0,
     .lccr0             = LCCR0_Color | LCCR0_Pas | LCCR0_Dual,