From 2aad80f48aa46b085b5a2142732733ffffe8f5b1 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sun, 4 Nov 2012 21:35:12 +0100 Subject: [PATCH] --- yaml --- r: 339861 b: refs/heads/master c: 439532ce1b6da6748c6d6c1e256292b69f84e298 h: refs/heads/master i: 339859: c072cb0ad24d022b2067345bf8d63b590d7f9cb1 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/integrator_cp.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 36377df264a7..5caf28f6f0e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6fae083b9cc7e27b65660eaa7b2ce6cf871b99a +refs/heads/master: 439532ce1b6da6748c6d6c1e256292b69f84e298 diff --git a/trunk/arch/arm/mach-integrator/integrator_cp.c b/trunk/arch/arm/mach-integrator/integrator_cp.c index 72202108bd71..fc2b1e48c760 100644 --- a/trunk/arch/arm/mach-integrator/integrator_cp.c +++ b/trunk/arch/arm/mach-integrator/integrator_cp.c @@ -84,11 +84,6 @@ static struct map_desc intcp_io_desc[] __initdata = { .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), .length = SZ_4K, .type = MT_DEVICE - }, { - .virtual = IO_ADDRESS(INTEGRATOR_SC_BASE), - .pfn = __phys_to_pfn(INTEGRATOR_SC_BASE), - .length = SZ_4K, - .type = MT_DEVICE }, { .virtual = IO_ADDRESS(INTEGRATOR_EBI_BASE), .pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE),