From c2ad6195b3385a91fb4aeab94ffd55e403d057de Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 12 Nov 2012 01:32:02 +0100 Subject: [PATCH] --- yaml --- r: 339862 b: refs/heads/master c: 328ba305e3871d4256398a80f45517ec9c814999 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-integrator/integrator_ap.c | 5 ----- trunk/arch/arm/mach-integrator/integrator_cp.c | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 5caf28f6f0e3..0c6a5f691727 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 439532ce1b6da6748c6d6c1e256292b69f84e298 +refs/heads/master: 328ba305e3871d4256398a80f45517ec9c814999 diff --git a/trunk/arch/arm/mach-integrator/integrator_ap.c b/trunk/arch/arm/mach-integrator/integrator_ap.c index becba430a246..771cbe44b662 100644 --- a/trunk/arch/arm/mach-integrator/integrator_ap.c +++ b/trunk/arch/arm/mach-integrator/integrator_ap.c @@ -120,11 +120,6 @@ static struct map_desc ap_io_desc[] __initdata = { .pfn = __phys_to_pfn(INTEGRATOR_UART0_BASE), .length = SZ_4K, .type = MT_DEVICE - }, { - .virtual = IO_ADDRESS(INTEGRATOR_UART1_BASE), - .pfn = __phys_to_pfn(INTEGRATOR_UART1_BASE), - .length = SZ_4K, - .type = MT_DEVICE }, { .virtual = IO_ADDRESS(INTEGRATOR_DBG_BASE), .pfn = __phys_to_pfn(INTEGRATOR_DBG_BASE), diff --git a/trunk/arch/arm/mach-integrator/integrator_cp.c b/trunk/arch/arm/mach-integrator/integrator_cp.c index fc2b1e48c760..c4b6af9a4239 100644 --- a/trunk/arch/arm/mach-integrator/integrator_cp.c +++ b/trunk/arch/arm/mach-integrator/integrator_cp.c @@ -104,11 +104,6 @@ static struct map_desc intcp_io_desc[] __initdata = { .pfn = __phys_to_pfn(INTEGRATOR_UART0_BASE), .length = SZ_4K, .type = MT_DEVICE - }, { - .virtual = IO_ADDRESS(INTEGRATOR_UART1_BASE), - .pfn = __phys_to_pfn(INTEGRATOR_UART1_BASE), - .length = SZ_4K, - .type = MT_DEVICE }, { .virtual = IO_ADDRESS(INTEGRATOR_DBG_BASE), .pfn = __phys_to_pfn(INTEGRATOR_DBG_BASE),