Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux...

[linux-2.6] / arch / arm / mach-s3c2440 / mach-smdk2440.c

diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 840a480c40debb4dc6f640dcdae7b0b9fd1ba41b..4552828bf8000965c4dcc7d09905dcf36b5668c8 100644 (file)
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -105,21 +105,18 @@ static struct s3c2410_uartcfg smdk2440_uartcfgs[] __initdata = {
 
 static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
 
-       .lcdcon1        = S3C2410_LCDCON1_TFT16BPP |
-                         S3C2410_LCDCON1_TFT |
-                         S3C2410_LCDCON1_CLKVAL(0x04),
-
        .lcdcon5        = S3C2410_LCDCON5_FRM565 |
                          S3C2410_LCDCON5_INVVLINE |
                          S3C2410_LCDCON5_INVVFRAME |
                          S3C2410_LCDCON5_PWREN |
                          S3C2410_LCDCON5_HWSWP,
 
-       .type           = S3C2410_LCDCON1_TFT16BPP,
+       .type           = S3C2410_LCDCON1_TFT,
 
        .width          = 240,
        .height         = 320,
 
+       .pixclock       = 166667, /* HCLK 60 MHz, divisor 10 */
        .xres           = 240,
        .yres           = 320,
        .bpp            = 16,