aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c6400/include
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-08-14 10:24:06 -0400
committerBen Dooks <ben-linux@fluff.org>2009-08-14 10:24:06 -0400
commitb282e29b547937d1610f38d6aa1c485426b62650 (patch)
tree62741a6d17e910e7b77a5cc4e94c44b7e587645c /arch/arm/mach-s3c6400/include
parentc378aa275e1476218a6b438056a4cd48eb1eca0f (diff)
parentc233d94931cebc8ec805fb98856f34ad16d49e4f (diff)
Merge branch 'next-s3c64xx-moves' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c6400/include')
-rw-r--r--arch/arm/mach-s3c6400/include/mach/map.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h
index 16c46305792e..fc8b223bad4f 100644
--- a/arch/arm/mach-s3c6400/include/mach/map.h
+++ b/arch/arm/mach-s3c6400/include/mach/map.h
@@ -38,6 +38,7 @@
38#define S3C_VA_UART2 S3C_VA_UARTx(2) 38#define S3C_VA_UART2 S3C_VA_UARTx(2)
39#define S3C_VA_UART3 S3C_VA_UARTx(3) 39#define S3C_VA_UART3 S3C_VA_UARTx(3)
40 40
41#define S3C64XX_PA_NAND (0x70200000)
41#define S3C64XX_PA_FB (0x77100000) 42#define S3C64XX_PA_FB (0x77100000)
42#define S3C64XX_PA_USB_HSOTG (0x7C000000) 43#define S3C64XX_PA_USB_HSOTG (0x7C000000)
43#define S3C64XX_PA_WATCHDOG (0x7E004000) 44#define S3C64XX_PA_WATCHDOG (0x7E004000)
@@ -74,6 +75,7 @@
74#define S3C_PA_HSMMC2 S3C64XX_PA_HSMMC2 75#define S3C_PA_HSMMC2 S3C64XX_PA_HSMMC2
75#define S3C_PA_IIC S3C64XX_PA_IIC0 76#define S3C_PA_IIC S3C64XX_PA_IIC0
76#define S3C_PA_IIC1 S3C64XX_PA_IIC1 77#define S3C_PA_IIC1 S3C64XX_PA_IIC1
78#define S3C_PA_NAND S3C64XX_PA_NAND
77#define S3C_PA_FB S3C64XX_PA_FB 79#define S3C_PA_FB S3C64XX_PA_FB
78#define S3C_PA_USBHOST S3C64XX_PA_USBHOST 80#define S3C_PA_USBHOST S3C64XX_PA_USBHOST
79#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG 81#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG