From 16a462676aa52efd51d83720f8fae65bc4758b5a Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 28 Jan 2010 18:17:29 +0900
Subject: [PATCH] --- yaml --- r: 181150 b: refs/heads/master c:
 d627a2ebd1a303aa4ac1962c553d1e8738735d01 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/arch/sh/include/asm/io.h | 36 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 0947e8125c8f..fa74708f544c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 849593591ce3b5f9352966c9d410284dc04d03b6
+refs/heads/master: d627a2ebd1a303aa4ac1962c553d1e8738735d01
diff --git a/trunk/arch/sh/include/asm/io.h b/trunk/arch/sh/include/asm/io.h
index 98c62fa168c2..bd5fafa23eb4 100644
--- a/trunk/arch/sh/include/asm/io.h
+++ b/trunk/arch/sh/include/asm/io.h
@@ -273,24 +273,6 @@ void __iomem *__ioremap_caller(unsigned long offset, unsigned long size,
 			       pgprot_t prot, void *caller);
 void __iounmap(void __iomem *addr);
 
-#ifdef CONFIG_IOREMAP_FIXED
-extern void __iomem *ioremap_fixed(resource_size_t, unsigned long,
-				   unsigned long, pgprot_t);
-extern int iounmap_fixed(void __iomem *);
-extern void ioremap_fixed_init(void);
-#else
-static inline void __iomem *
-ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
-	      unsigned long size, pgprot_t prot)
-{
-	BUG();
-	return NULL;
-}
-
-static inline void ioremap_fixed_init(void) { }
-static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
-#endif
-
 static inline void __iomem *
 __ioremap(unsigned long offset, unsigned long size, pgprot_t prot)
 {
@@ -365,6 +347,24 @@ ioremap_prot(resource_size_t offset, unsigned long size, unsigned long flags)
 }
 #endif
 
+#ifdef CONFIG_IOREMAP_FIXED
+extern void __iomem *ioremap_fixed(resource_size_t, unsigned long,
+				   unsigned long, pgprot_t);
+extern int iounmap_fixed(void __iomem *);
+extern void ioremap_fixed_init(void);
+#else
+static inline void __iomem *
+ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
+	      unsigned long size, pgprot_t prot)
+{
+	BUG();
+	return NULL;
+}
+
+static inline void ioremap_fixed_init(void) { }
+static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
+#endif
+
 #define ioremap_nocache	ioremap
 #define iounmap		__iounmap