1 files changed, 9 insertions, 1 deletions

diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index 67049e4bd2ef..88009549ab28 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -53,6 +53,15 @@
 #define S5PC100_PA_IIC0         (0xEC100000)
 #define S5PC100_PA_IIC1         (0xEC200000)
 
+/* SPI */
+#define S5PC100_PA_SPI0         0xEC300000
+#define S5PC100_PA_SPI1         0xEC400000
+#define S5PC100_PA_SPI2         0xEC500000
+
+/* USB HS OTG */
+#define S5PC100_PA_USB_HSOTG    (0xED200000)
+#define S5PC100_PA_USB_HSPHY    (0xED300000)
+
 #define S5PC100_PA_FB           (0xEE000000)
 
 #define S5PC100_PA_AC97         0xF2300000
@@ -63,7 +72,6 @@
 
 /* KEYPAD */
 #define S5PC100_PA_KEYPAD       (0xF3100000)
->>>>>>> for-2635-4/s5p-devs:arch/arm/mach-s5pc100/include/mach/map.h
 
 #define S5PC100_PA_HSMMC(x)     (0xED800000 + ((x) * 0x100000))