diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-01-08 12:31:24 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-01-08 12:31:24 +0100 |
commit | 636f0c70f2557e0819b50c74e31b4a027327015e (patch) | |
tree | 3a259ef26659dac92782651440091b9f5ab1a7f7 /arch/arm/mach-exynos/cpu.c | |
parent | 675eef66e3edcab8065533edfefbcbbacb9a30d3 (diff) | |
parent | 2e885057b7f75035f0b85e02f737891482815a81 (diff) | |
download | linux-636f0c70f2557e0819b50c74e31b4a027327015e.tar.gz linux-636f0c70f2557e0819b50c74e31b4a027327015e.tar.bz2 linux-636f0c70f2557e0819b50c74e31b4a027327015e.zip |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'arch/arm/mach-exynos/cpu.c')
-rw-r--r-- | arch/arm/mach-exynos/cpu.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/cpu.c b/arch/arm/mach-exynos/cpu.c index 90ec247f3b37..cc8d4bd6d0f7 100644 --- a/arch/arm/mach-exynos/cpu.c +++ b/arch/arm/mach-exynos/cpu.c @@ -111,11 +111,6 @@ static struct map_desc exynos4_iodesc[] __initdata = { .length = SZ_4K, .type = MT_DEVICE, }, { - .virtual = (unsigned long)S5P_VA_SROMC, - .pfn = __phys_to_pfn(EXYNOS4_PA_SROMC), - .length = SZ_4K, - .type = MT_DEVICE, - }, { .virtual = (unsigned long)S3C_VA_USB_HSPHY, .pfn = __phys_to_pfn(EXYNOS4_PA_HSPHY), .length = SZ_4K, |