diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 08:24:02 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 08:24:02 -0500 |
commit | bbba75606963c82febf7bd2761ea848ac5d1a1bb (patch) | |
tree | 50880b4539c578c407f6c1aa605fddf5e371bb7e /arch/arm/plat-s5p/cpu.c | |
parent | 073154459b80a43f7e4f088b11c93c8e9cb07f14 (diff) | |
parent | ccbc87693dcb428443a72d644e63484676517c2d (diff) |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
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 74f7f5a5446c..047d31c1bbd8 100644 --- a/arch/arm/plat-s5p/cpu.c +++ b/arch/arm/plat-s5p/cpu.c | |||
@@ -108,6 +108,11 @@ static struct map_desc s5p_iodesc[] __initdata = { | |||
108 | .pfn = __phys_to_pfn(S3C_PA_WDT), | 108 | .pfn = __phys_to_pfn(S3C_PA_WDT), |
109 | .length = SZ_4K, | 109 | .length = SZ_4K, |
110 | .type = MT_DEVICE, | 110 | .type = MT_DEVICE, |
111 | }, { | ||
112 | .virtual = (unsigned long)S5P_VA_SROMC, | ||
113 | .pfn = __phys_to_pfn(S5P_PA_SROMC), | ||
114 | .length = SZ_4K, | ||
115 | .type = MT_DEVICE, | ||
111 | }, | 116 | }, |
112 | }; | 117 | }; |
113 | 118 | ||