[ARM] Convert asm/io.h to linux/io.h

[linux-2.6-omap-h63xx.git] / arch / arm / mach-s3c2410 / mach-amlm5900.c

diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index c4754226874da86e9d1f67d9188b9de129b14994..527f88a288ec4ea094ffb4dc63e2a27e5c606b46 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -36,21 +36,21 @@
 #include <linux/platform_device.h>
 #include <linux/proc_fs.h>
 #include <linux/serial_core.h>
+#include <linux/io.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/flash.h>
 
-#include <asm/hardware.h>
-#include <asm/io.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-lcd.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-lcd.h>
+#include <mach/regs-gpio.h>
 
 #include <asm/plat-s3c24xx/devs.h>
 #include <asm/plat-s3c24xx/cpu.h>
@@ -174,6 +174,7 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = {
 
        .type           = S3C2410_LCDCON1_STN4,
 
+       .pixclock       = 680000, /* HCLK = 100MHz */
        .xres           = 160,
        .yres           = 160,
        .bpp            = 4,
@@ -183,7 +184,6 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = {
        .upper_margin   = 0,
        .lower_margin   = 0,
 
-       .lcdcon1        = 0x00008225,
        .lcdcon5        = 0x00000001,
 };