Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[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 78dfc7d4270f9289a1b896798cdfb6c53969008c..7c1145e87c121d0b4f492b3c4b8cea05ab4f4eb7 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -134,10 +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),
-
        .lcdcon5=       S3C2410_LCDCON5_FRM565 | \
                        S3C2410_LCDCON5_INVVLINE | \
                        S3C2410_LCDCON5_HWSWP,
@@ -145,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,