From 388997ae8c1ef11d6b46ed51c07a118ccf415b49 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 28 Oct 2005 14:25:28 +0100
Subject: [PATCH] --- yaml --- r: 10412 b: refs/heads/master c:
 674c04538284736c4a44224c78cb784b2c972f98 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mm/ioremap.c                  | 1 +
 trunk/drivers/mtd/maps/sa1100-flash.c        | 1 +
 trunk/include/asm-arm/arch-sa1100/hardware.h | 7 -------
 trunk/include/asm-arm/arch-sa1100/io.h       | 6 +++++-
 trunk/include/asm-arm/arch-sa1100/system.h   | 1 +
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9704b3839409..9516af6ef712 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6b8fdad144bbb915d124ffd95011ad55730bf9f
+refs/heads/master: 674c04538284736c4a44224c78cb784b2c972f98
diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c
index 7110e54182b1..6fb1258df1b5 100644
--- a/trunk/arch/arm/mm/ioremap.c
+++ b/trunk/arch/arm/mm/ioremap.c
@@ -26,6 +26,7 @@
 #include <linux/vmalloc.h>
 
 #include <asm/cacheflush.h>
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/tlbflush.h>
 
diff --git a/trunk/drivers/mtd/maps/sa1100-flash.c b/trunk/drivers/mtd/maps/sa1100-flash.c
index 8dcaa357b4bb..9133351ba483 100644
--- a/trunk/drivers/mtd/maps/sa1100-flash.c
+++ b/trunk/drivers/mtd/maps/sa1100-flash.c
@@ -21,6 +21,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/concat.h>
 
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
 #include <asm/mach/flash.h>
diff --git a/trunk/include/asm-arm/arch-sa1100/hardware.h b/trunk/include/asm-arm/arch-sa1100/hardware.h
index 19c3b1e186bb..28711aaa4968 100644
--- a/trunk/include/asm-arm/arch-sa1100/hardware.h
+++ b/trunk/include/asm-arm/arch-sa1100/hardware.h
@@ -21,13 +21,6 @@
 #define UNCACHEABLE_ADDR	0xfa050000
 
 
-/*
- * We requires absolute addresses i.e. (PCMCIA_IO_0_BASE + 0x3f8) for 
- * in*()/out*() macros to be usable for all cases.
- */
-#define PCIO_BASE		0
-
-
 /*
  * SA1100 internal I/O mappings
  *
diff --git a/trunk/include/asm-arm/arch-sa1100/io.h b/trunk/include/asm-arm/arch-sa1100/io.h
index 9c8f588f35db..9d4fe6cf205b 100644
--- a/trunk/include/asm-arm/arch-sa1100/io.h
+++ b/trunk/include/asm-arm/arch-sa1100/io.h
@@ -18,7 +18,11 @@
  * We don't actually have real ISA nor PCI buses, but there is so many 
  * drivers out there that might just work if we fake them...
  */
-#define __io(a)			((void __iomem *)(PCIO_BASE + (a)))
+static inline void __iomem *__io(unsigned long addr)
+{
+	return (void __iomem *)addr;
+}
+#define __io(a)			__io(a)
 #define __mem_pci(a)		(a)
 #define __mem_isa(a)		(a)
 
diff --git a/trunk/include/asm-arm/arch-sa1100/system.h b/trunk/include/asm-arm/arch-sa1100/system.h
index 6f52118ba1a4..0f0612f79b2b 100644
--- a/trunk/include/asm-arm/arch-sa1100/system.h
+++ b/trunk/include/asm-arm/arch-sa1100/system.h
@@ -4,6 +4,7 @@
  * Copyright (c) 1999 Nicolas Pitre <nico@cam.org>
  */
 #include <linux/config.h>
+#include <asm/hardware.h>
 
 static inline void arch_idle(void)
 {