diff options
| author |   Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:34:55 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 21:34:55 +0900 |
| commit | f2b7e3c54a304677a1142829fb5913595885379f (patch) | |
| tree | 1eb941524c7325672f947dab525d96228b362e20 /arch/arm/plat-s5p/cpu.c | |
| parent | Merge branch 'next-s5pv310' into for-next (diff) | |
| parent | ARM: S5P: Add s5p_reset_hook() for perform reset using SWRESET on S5P SoCs (diff) | |
| download | linux-dev-f2b7e3c54a304677a1142829fb5913595885379f.tar.xz linux-dev-f2b7e3c54a304677a1142829fb5913595885379f.zip | |
Merge branch 'next-s5p' into for-next
Conflicts:
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
Diffstat (limited to 'arch/arm/plat-s5p/cpu.c')
| -rw-r--r-- | arch/arm/plat-s5p/cpu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c index 9261a27d7fe5..b07a078fd284 100644 --- a/arch/arm/plat-s5p/cpu.c +++ b/arch/arm/plat-s5p/cpu.c @@ -115,6 +115,11 @@ static struct map_desc s5p_iodesc[] __initdata = { .pfn = __phys_to_pfn(S5P_PA_GPIO), .length = SZ_4K, .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S3C_VA_WATCHDOG, + .pfn = __phys_to_pfn(S3C_PA_WDT), + .length = SZ_4K, + .type = MT_DEVICE, }, }; |