summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5pv210/cpu.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-10-11 17:26:50 (GMT)
committerRobert Richter <robert.richter@amd.com>2010-10-11 17:26:50 (GMT)
commitad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5 (patch)
tree2565121e4b9945d953e02c77a2e53065b3789aa4 /arch/arm/mach-s5pv210/cpu.c
parent86c8c04792f152c5469023885510140dd34817bc (diff)
parentc7a27aa4652c63172489a73f3961455650a79a7f (diff)
downloadlinux-ad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5.tar.xz
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
Diffstat (limited to 'arch/arm/mach-s5pv210/cpu.c')
-rw-r--r--arch/arm/mach-s5pv210/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index b9f4d67..77f456c 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -47,7 +47,7 @@ static struct map_desc s5pv210_iodesc[] __initdata = {
{
.virtual = (unsigned long)S5P_VA_SYSTIMER,
.pfn = __phys_to_pfn(S5PV210_PA_SYSTIMER),
- .length = SZ_1M,
+ .length = SZ_4K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)VA_VIC2,