Merge branch 'linus' into x86/amd-iommu

[linux-2.6] / arch / arm / mach-s3c2410 / mach-h1940.c

diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index c0933b6c71b5271c0c582cfc05cade5548628d00..7c1145e87c121d0b4f492b3c4b8cea05ab4f4eb7 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -134,18 +134,6 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = {
  * Set lcd on or off
  **/
 static struct s3c2410fb_display h1940_lcd __initdata = {
-       .lcdcon1=       S3C2410_LCDCON1_TFT16BPP | \
-                       S3C2410_LCDCON1_TFT | \
-                       S3C2410_LCDCON1_CLKVAL(0x0C),
-
-       .lcdcon2=       S3C2410_LCDCON2_VBPD(7) | \
-                       S3C2410_LCDCON2_LINEVAL(319) | \
-                       S3C2410_LCDCON2_VFPD(6) | \
-                       S3C2410_LCDCON2_VSPW(0),
-
-       .lcdcon4=       S3C2410_LCDCON4_MVAL(0) | \
-                       S3C2410_LCDCON4_HSPW(3),
-
        .lcdcon5=       S3C2410_LCDCON5_FRM565 | \
                        S3C2410_LCDCON5_INVVLINE | \
                        S3C2410_LCDCON5_HWSWP,
@@ -153,6 +141,7 @@ static struct s3c2410fb_display h1940_lcd __initdata = {
        .type =         S3C2410_LCDCON1_TFT,
        .width =        240,
        .height =       320,
+       .pixclock =     260000,
        .xres =         240,
        .yres =         320,
        .bpp =          16,
@@ -165,8 +154,6 @@ static struct s3c2410fb_display h1940_lcd __initdata = {
 };
 
 static struct s3c2410fb_mach_info h1940_fb_info __initdata = {
-       .fixed_syncs =          1,
-
        .displays = &h1940_lcd,
        .num_displays = 1,
        .default_display = 0,