Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bf2a3a26d18679c94eca973cb8741e3c1ac53c43
Commit:     bf2a3a26d18679c94eca973cb8741e3c1ac53c43
Parent:     ae39ae0b0030d7f96a6b7b06d9c77c8ad2a07673
Author:     Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 22 16:20:04 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Jul 22 16:44:42 2007 +0100

    [ARM] 4520/1: S3C: Remove old VA values from static map
    
    Remove the static maps for the LCD and USB devices.
    
    Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2412/s3c2412.c         |    1 -
 arch/arm/plat-s3c24xx/s3c244x.c         |    1 -
 include/asm-arm/arch-s3c2410/map.h      |    2 --
 include/asm-arm/arch-s3c2410/regs-lcd.h |    2 +-
 4 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c
index 12995d8..66f471a 100644
--- a/arch/arm/mach-s3c2412/s3c2412.c
+++ b/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/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c
index 8b2d47f..3444b13 100644
--- a/arch/arm/plat-s3c24xx/s3c244x.c
+++ b/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/include/asm-arm/arch-s3c2410/map.h 
b/include/asm-arm/arch-s3c2410/map.h
index bec267b..95b9aee 100644
--- a/include/asm-arm/arch-s3c2410/map.h
+++ b/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/include/asm-arm/arch-s3c2410/regs-lcd.h 
b/include/asm-arm/arch-s3c2410/regs-lcd.h
index b7faeb0..76fe5f6 100644
--- a/include/asm-arm/arch-s3c2410/regs-lcd.h
+++ b/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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to