From ce04e3de2a23b81236c2b190cf54de8a27fa09c9 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 28 Nov 2008 16:13:44 +0000
Subject: [PATCH] --- yaml --- r: 123583 b: refs/heads/master c:
 47190a3350032ecbb6e17b18e22a1dca2265013a h: refs/heads/master i:   123581:
 1850e6afa4c9a86ac1cafc83d83c6bad77e8009a   123579:
 65d0e51a10f7911ecb6719fe0b548f09cf63dc92   123575:
 891ae2f5afa121e741a5cdd04df1c0c6e08d93b7   123567:
 83ab4312c02e0fd6c35087d3e3914925d98b3757   123551:
 b37cd6bfd19e186b7e2cc156482e41d0f6fbc496   123519:
 419b45c0a0d290fced08018d8fd3df637b0f11ca v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-shark/core.c              |  2 ++
 .../arm/mach-shark/include/mach/hardware.h    |  2 --
 trunk/arch/arm/mach-shark/include/mach/io.h   | 27 +++----------------
 4 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 233d221e56dd..80335a90f82d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 514161b601ff5d6e089582f8d8ad74baea0d200b
+refs/heads/master: 47190a3350032ecbb6e17b18e22a1dca2265013a
diff --git a/trunk/arch/arm/mach-shark/core.c b/trunk/arch/arm/mach-shark/core.c
index a9400d984451..a23fd3d0163a 100644
--- a/trunk/arch/arm/mach-shark/core.c
+++ b/trunk/arch/arm/mach-shark/core.c
@@ -16,6 +16,8 @@
 #include <asm/leds.h>
 #include <asm/param.h>
 
+#include <mach/hardware.h>
+
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
diff --git a/trunk/arch/arm/mach-shark/include/mach/hardware.h b/trunk/arch/arm/mach-shark/include/mach/hardware.h
index cb0ee2943c1a..01bf76099ce5 100644
--- a/trunk/arch/arm/mach-shark/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-shark/include/mach/hardware.h
@@ -28,8 +28,6 @@
 #define ROMCARD_SIZE		0x08000000
 #define ROMCARD_START		0x10000000
 
-#define PCIO_BASE		0xe0000000
-
 
 /* defines for the Framebuffer */
 #define FB_START		0x06000000
diff --git a/trunk/arch/arm/mach-shark/include/mach/io.h b/trunk/arch/arm/mach-shark/include/mach/io.h
index 751ab419e4ff..c5cee829fc87 100644
--- a/trunk/arch/arm/mach-shark/include/mach/io.h
+++ b/trunk/arch/arm/mach-shark/include/mach/io.h
@@ -11,29 +11,10 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
-#include <mach/hardware.h>
+#define PCIO_BASE	0xe0000000
+#define IO_SPACE_LIMIT	0xffffffff
 
-#define IO_SPACE_LIMIT 0xffffffff
-
-/*
- * We use two different types of addressing - PC style addresses, and ARM
- * addresses.  PC style accesses the PC hardware with the normal PC IO
- * addresses, eg 0x3f8 for serial#1.  ARM addresses are 0x80000000+
- * and are translated to the start of IO.
- */
-#define __PORT_PCIO(x)	(!((x) & 0x80000000))
-
-#define __io(a)                 ((void __iomem *)(PCIO_BASE + (a)))
-
-
-static inline unsigned int __ioaddr (unsigned int port)			\
-{										\
-	if (__PORT_PCIO(port))							\
-		return (unsigned int)(PCIO_BASE + (port));			\
-	else									\
-		return (unsigned int)(IO_BASE + (port));			\
-}
-
-#define __mem_pci(addr) (addr)
+#define __io(a)		((void __iomem *)(PCIO_BASE + (a)))
+#define __mem_pci(addr)	(addr)
 
 #endif