Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-s5p6442 / include / mach / map.h

diff --git a/arch/arm/mach-s5p6442/include/mach/map.h b/arch/arm/mach-s5p6442/include/mach/map.h
index 281d256faafb0d6e4e817261ac78e5b091a4078d..31fb2e68d527915080df5f9ff498c835218f972c 100644 (file)
--- a/arch/arm/mach-s5p6442/include/mach/map.h
+++ b/arch/arm/mach-s5p6442/include/mach/map.h
@@ -23,16 +23,10 @@
 #define S5P_PA_SYSCON          S5P6442_PA_SYSCON
 
 #define S5P6442_PA_GPIO                (0xE0200000)
-#define S5P_PA_GPIO            S5P6442_PA_GPIO
 
 #define S5P6442_PA_VIC0                (0xE4000000)
-#define S5P_PA_VIC0            S5P6442_PA_VIC0
-
 #define S5P6442_PA_VIC1                (0xE4100000)
-#define S5P_PA_VIC1            S5P6442_PA_VIC1
-
 #define S5P6442_PA_VIC2                (0xE4200000)
-#define S5P_PA_VIC2            S5P6442_PA_VIC2
 
 #define S5P6442_PA_MDMA                0xE8000000
 #define S5P6442_PA_PDMA                0xE9000000