summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-02-03 02:06:42 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2006-02-18 16:30:40 -0500
commitad6b97fc929e5844bfd1d708ab1d74d131d7960d (patch)
treea612bab865a960c88dbff2f0f19ed22be779fa81
parentcead14da59fc261534fa749886c12c16757711fd (diff)
[PATCH] iomap_copy fallout (m68k)
added __raw_writel(), sanitized include order in iomap_copy.c Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--include/asm-m68k/raw_io.h1
-rw-r--r--lib/iomap_copy.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-m68k/raw_io.h b/include/asm-m68k/raw_io.h
index 5439bcaa57c6..811ccd25d4a6 100644
--- a/include/asm-m68k/raw_io.h
+++ b/include/asm-m68k/raw_io.h
@@ -336,6 +336,7 @@ static inline void raw_outsw_swapw(volatile u16 __iomem *port, const u16 *buf,
: "d0", "a0", "a1", "d6");
}
+#define __raw_writel raw_outl
#endif /* __KERNEL__ */
diff --git a/lib/iomap_copy.c b/lib/iomap_copy.c
index a6b1e271d53c..351045f4f63c 100644
--- a/lib/iomap_copy.c
+++ b/lib/iomap_copy.c
@@ -15,8 +15,8 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <linux/io.h>
#include <linux/module.h>
+#include <linux/io.h>
/**
* __iowrite32_copy - copy data to MMIO space, in 32-bit units