From 64819dfec4d836d19c5a0def07b4e730e8019462 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 29 Jan 2012 11:23:33 +0000
Subject: [PATCH] --- yaml --- r: 296287 b: refs/heads/master c:
 fbae0f8912dc12b284433c05417ea76311205bbf h: refs/heads/master i:   296285:
 1949469d4fbb25f552f206b7071e426f85cd7074   296283:
 03c8692ee85e9063c91c66de0723ba994e193431   296279:
 fc1bba10515adf0e02c3febf99daaf7115d4bfdf   296271:
 968f8662e11603eaebac63ce3eeabcf7790b39bc   296255:
 18e66e814119b2bf509b97dc383885d6dfb14f86 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-sa1100/neponset.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ec25712b6be7..49be169241b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f942b0fd6c81416bb8d52bc26a76a58c02d87bc2
+refs/heads/master: fbae0f8912dc12b284433c05417ea76311205bbf
diff --git a/trunk/arch/arm/mach-sa1100/neponset.c b/trunk/arch/arm/mach-sa1100/neponset.c
index 3c0d4b837adb..7ffa631eede4 100644
--- a/trunk/arch/arm/mach-sa1100/neponset.c
+++ b/trunk/arch/arm/mach-sa1100/neponset.c
@@ -434,12 +434,7 @@ static int __init neponset_init(void)
 subsys_initcall(neponset_init);
 
 static struct map_desc neponset_io_desc[] __initdata = {
-	{	/* System Registers */
-		.virtual	=  0xf3000000,
-		.pfn		= __phys_to_pfn(0x10000000),
-		.length		= SZ_1M,
-		.type		= MT_DEVICE
-	}, {	/* SA-1111 */
+	{	/* SA-1111 */
 		.virtual	=  0xf4000000,
 		.pfn		= __phys_to_pfn(0x40000000),
 		.length		= SZ_1M,