summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5pv210/include
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 10:51:40 (GMT)
committerBen Dooks <ben-linux@fluff.org>2010-05-20 10:51:40 (GMT)
commit6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (patch)
tree6bdfd633a261a0b434ad7060a3c2d1ee1d9b377d /arch/arm/mach-s5pv210/include
parenta2f7bffa29f18266bc7b55a2b47a5fa1274ed53f (diff)
parent5b7d7b22dc8469fbe1ca10b2adeabb70639bde01 (diff)
downloadlinux-6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c.tar.xz
ARM: Merge for-2635-4/watchdog
Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2 Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c arch/arm/mach-s5p6440/Kconfig arch/arm/mach-s5p6440/include/mach/map.h arch/arm/mach-s5p6440/mach-smdk6440.c arch/arm/mach-s5pv210/Kconfig arch/arm/mach-s5pv210/include/mach/map.h arch/arm/mach-s5pv210/mach-smdkv210.c
Diffstat (limited to 'arch/arm/mach-s5pv210/include')
-rw-r--r--arch/arm/mach-s5pv210/include/mach/map.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 6fb7bfd..3a44e1e 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -38,6 +38,8 @@
#define S5PV210_PA_SYSTIMER (0xE2600000)
+#define S5PV210_PA_WATCHDOG (0xE2700000)
+
#define S5PV210_PA_UART (0xE2900000)
#define S5P_PA_UART0 (S5PV210_PA_UART + 0x0)
@@ -96,6 +98,7 @@
#define S3C_PA_IIC1 S5PV210_PA_IIC1
#define S3C_PA_IIC2 S5PV210_PA_IIC2
#define S3C_PA_FB S5PV210_PA_FB
+#define S3C_PA_WDT S5PV210_PA_WATCHDOG
#define SAMSUNG_PA_ADC S5PV210_PA_ADC