From c86bd4a1c834e6b456f45204e07bfafb35a10773 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 29 Jan 2012 10:37:36 +0000
Subject: [PATCH] --- yaml --- r: 296307 b: refs/heads/master c:
 876c1f27852ff1e45e1164da15847d3b25600160 h: refs/heads/master i:   296305:
 7aa6b4b4f415ab49f3d5218d400020ce78c61255   296303:
 d1b2024f2a8aedba4c9fe9841ad4ce79959891dc v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-sa1100/badge4.c     | 5 -----
 trunk/arch/arm/mach-sa1100/jornada720.c | 5 -----
 trunk/arch/arm/mach-sa1100/neponset.c   | 5 -----
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 77b671e76b2e..4d77bce054a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22eeaff367ac85a09643b2b8a5af064ec8773f63
+refs/heads/master: 876c1f27852ff1e45e1164da15847d3b25600160
diff --git a/trunk/arch/arm/mach-sa1100/badge4.c b/trunk/arch/arm/mach-sa1100/badge4.c
index 8fb80f02c2a9..645ffa1ddc7c 100644
--- a/trunk/arch/arm/mach-sa1100/badge4.c
+++ b/trunk/arch/arm/mach-sa1100/badge4.c
@@ -285,11 +285,6 @@ static struct map_desc badge4_io_desc[] __initdata = {
 		.pfn		= __phys_to_pfn(0x10000000),
 		.length		= 0x00100000,
 		.type		= MT_DEVICE
-	}, {	/* SA-1111      */
-		.virtual	= 0xf4000000,
-		.pfn		= __phys_to_pfn(0x48000000),
-		.length		= 0x00100000,
-		.type		= MT_DEVICE
 	}
 };
 
diff --git a/trunk/arch/arm/mach-sa1100/jornada720.c b/trunk/arch/arm/mach-sa1100/jornada720.c
index dcd6d026aa68..5d2ceb40dac9 100644
--- a/trunk/arch/arm/mach-sa1100/jornada720.c
+++ b/trunk/arch/arm/mach-sa1100/jornada720.c
@@ -285,11 +285,6 @@ static struct map_desc jornada720_io_desc[] __initdata = {
 		.pfn		= __phys_to_pfn(EPSONFBSTART),
 		.length		= EPSONFBLEN,
 		.type		= MT_DEVICE
-	}, {	/* SA-1111 */
-		.virtual	= 0xf4000000,
-		.pfn		= __phys_to_pfn(SA1111REGSTART),
-		.length		= SA1111REGLEN,
-		.type		= MT_DEVICE
 	}
 };
 
diff --git a/trunk/arch/arm/mach-sa1100/neponset.c b/trunk/arch/arm/mach-sa1100/neponset.c
index b40a7192f09f..290afedde749 100644
--- a/trunk/arch/arm/mach-sa1100/neponset.c
+++ b/trunk/arch/arm/mach-sa1100/neponset.c
@@ -333,11 +333,6 @@ static struct map_desc neponset_io_desc[] __initdata = {
 		.pfn		= __phys_to_pfn(0x10000000),
 		.length		= SZ_1M,
 		.type		= MT_DEVICE
-	}, {	/* SA-1111 */
-		.virtual	=  0xf4000000,
-		.pfn		= __phys_to_pfn(0x40000000),
-		.length		= SZ_1M,
-		.type		= MT_DEVICE
 	}
 };