From 29a65d466b70ee8de294e481a0233a9bef23f27d Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Sun, 22 Jul 2007 16:20:04 +0100
Subject: [PATCH] --- yaml --- r: 62679 b: refs/heads/master c:
 bf2a3a26d18679c94eca973cb8741e3c1ac53c43 h: refs/heads/master i:   62677:
 b9b1897863a6d919ea2992a33e2d0fc46a8b7a0b   62675:
 64b0aab52e1cc331e0c0dd41b40ad8a0d3e505ab   62671:
 8cfe0a9bf4a59c07c8e67289504e2eb6e57b5260 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-s3c2412/s3c2412.c         | 1 -
 trunk/arch/arm/plat-s3c24xx/s3c244x.c         | 1 -
 trunk/include/asm-arm/arch-s3c2410/map.h      | 2 --
 trunk/include/asm-arm/arch-s3c2410/regs-lcd.h | 2 +-
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2ef0e4d50806..c0fc04722f8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae39ae0b0030d7f96a6b7b06d9c77c8ad2a07673
+refs/heads/master: bf2a3a26d18679c94eca973cb8741e3c1ac53c43
diff --git a/trunk/arch/arm/mach-s3c2412/s3c2412.c b/trunk/arch/arm/mach-s3c2412/s3c2412.c
index 12995d859b2c..66f471a9d64a 100644
--- a/trunk/arch/arm/mach-s3c2412/s3c2412.c
+++ b/trunk/arch/arm/mach-s3c2412/s3c2412.c
@@ -63,7 +63,6 @@ static inline void s3c2412_init_gpio2(void)
 
 static struct map_desc s3c2412_iodesc[] __initdata = {
 	IODESC_ENT(CLKPWR),
-	IODESC_ENT(LCD),
 	IODESC_ENT(TIMER),
 	IODESC_ENT(WATCHDOG),
 };
diff --git a/trunk/arch/arm/plat-s3c24xx/s3c244x.c b/trunk/arch/arm/plat-s3c24xx/s3c244x.c
index 8b2d47f2e80e..3444b13afac5 100644
--- a/trunk/arch/arm/plat-s3c24xx/s3c244x.c
+++ b/trunk/arch/arm/plat-s3c24xx/s3c244x.c
@@ -47,7 +47,6 @@ static struct map_desc s3c244x_iodesc[] __initdata = {
 	IODESC_ENT(CLKPWR),
 	IODESC_ENT(TIMER),
 	IODESC_ENT(WATCHDOG),
-	IODESC_ENT(LCD),
 };
 
 /* uart initialisation */
diff --git a/trunk/include/asm-arm/arch-s3c2410/map.h b/trunk/include/asm-arm/arch-s3c2410/map.h
index bec267b1d212..95b9aee54733 100644
--- a/trunk/include/asm-arm/arch-s3c2410/map.h
+++ b/trunk/include/asm-arm/arch-s3c2410/map.h
@@ -56,7 +56,6 @@
 #define S3C24XX_SZ_CLKPWR  SZ_1M
 
 /* LCD controller */
-#define S3C24XX_VA_LCD	   S3C2410_ADDR(0x00300000)
 #define S3C2410_PA_LCD	   (0x4D000000)
 #define S3C24XX_SZ_LCD	   SZ_1M
 
@@ -75,7 +74,6 @@
 #define S3C24XX_SZ_TIMER   SZ_1M
 
 /* USB Device port */
-#define S3C24XX_VA_USBDEV  S3C2410_ADDR(0x00600000)
 #define S3C2410_PA_USBDEV  (0x52000000)
 #define S3C24XX_SZ_USBDEV  SZ_1M
 
diff --git a/trunk/include/asm-arm/arch-s3c2410/regs-lcd.h b/trunk/include/asm-arm/arch-s3c2410/regs-lcd.h
index b7faeb04c0ff..76fe5f693426 100644
--- a/trunk/include/asm-arm/arch-s3c2410/regs-lcd.h
+++ b/trunk/include/asm-arm/arch-s3c2410/regs-lcd.h
@@ -12,7 +12,7 @@
 #ifndef ___ASM_ARCH_REGS_LCD_H
 #define ___ASM_ARCH_REGS_LCD_H "$Id: lcd.h,v 1.3 2003/06/26 13:25:06 ben Exp $"
 
-#define S3C2410_LCDREG(x) ((x) + S3C24XX_VA_LCD)
+#define S3C2410_LCDREG(x)	(x)
 
 /* LCD control registers */
 #define S3C2410_LCDCON1	    S3C2410_LCDREG(0x00)