Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

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

diff --git a/arch/arm/mach-s3c2410/include/mach/map.h b/arch/arm/mach-s3c2410/include/mach/map.h
index f07d68066d7ece26b07a86a16aa64d73ef30312b..cd3983ad41604ee71234b2d14ce79e51563bad91 100644 (file)
--- a/arch/arm/mach-s3c2410/include/mach/map.h
+++ b/arch/arm/mach-s3c2410/include/mach/map.h
@@ -67,6 +67,8 @@
 #define S3C2443_PA_HSMMC   (0x4A800000)
 #define S3C2416_PA_HSMMC0  (0x4AC00000)
 
+#define        S3C2443_PA_FB   (0x4C800000)
+
 /* S3C2412 memory and IO controls */
 #define S3C2412_PA_SSMC        (0x4F000000)
 #define S3C2412_VA_SSMC        S3C_ADDR_CPU(0x00000000)
@@ -106,11 +108,13 @@
 #define S3C24XX_PA_SDI      S3C2410_PA_SDI
 #define S3C24XX_PA_NAND            S3C2410_PA_NAND
 
+#define S3C_PA_FB          S3C2443_PA_FB
 #define S3C_PA_IIC          S3C2410_PA_IIC
 #define S3C_PA_UART        S3C24XX_PA_UART
 #define S3C_PA_USBHOST S3C2410_PA_USBHOST
 #define S3C_PA_HSMMC0      S3C2443_PA_HSMMC
 #define S3C_PA_HSMMC1      S3C2416_PA_HSMMC0
+#define S3C_PA_WDT         S3C2410_PA_WATCHDOG
 #define S3C_PA_NAND        S3C24XX_PA_NAND
 
 #endif /* __ASM_ARCH_MAP_H */