[PATCH] M68k iomap cleanup

Move m68k low-level iomap definitions from asm/io.h to asm/raw_io.h, so zorro.h
and nubus.h can include raw_io.h instead of io.h (as suggested by Richard
Zidlicky)

include/asm-m68k/io.h

@@ -280,18 +280,6 @@ static inline void isa_delay(void)
 #endif /* CONFIG_PCI */
 
 
-/* Values for nocacheflag and cmode */
-#define IOMAP_FULL_CACHING		0
-#define IOMAP_NOCACHE_SER		1
-#define IOMAP_NOCACHE_NONSER		2
-#define IOMAP_WRITETHROUGH		3
-
-extern void iounmap(void *addr);
-
-extern void *__ioremap(unsigned long physaddr, unsigned long size,
-		       int cacheflag);
-extern void __iounmap(void *addr, unsigned long size);
-
 extern inline void *ioremap(unsigned long physaddr, unsigned long size)
 {
 	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);

include/asm-m68k/nubus.h

 #ifndef _ASM_M68K_NUBUS_H
 #define _ASM_M68K_NUBUS_H
 
-#include <asm/io.h>
+#include <asm/raw_io.h>
 
 #define nubus_readb raw_inb
 #define nubus_readw raw_inw

include/asm-m68k/raw_io.h

@@ -11,6 +11,19 @@
 #ifdef __KERNEL__
 
 
+/* Values for nocacheflag and cmode */
+#define IOMAP_FULL_CACHING		0
+#define IOMAP_NOCACHE_SER		1
+#define IOMAP_NOCACHE_NONSER		2
+#define IOMAP_WRITETHROUGH		3
+
+extern void iounmap(void *addr);
+
+extern void *__ioremap(unsigned long physaddr, unsigned long size,
+		       int cacheflag);
+extern void __iounmap(void *addr, unsigned long size);
+
+
 /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates
  * two accesses to memory, which may be undesirable for some devices.
  */

include/asm-m68k/zorro.h

 #ifndef _ASM_M68K_ZORRO_H
 #define _ASM_M68K_ZORRO_H
 
-#include <asm/io.h>
+#include <asm/raw_io.h>
 
 #define z_readb raw_inb
 #define z_readw raw_inw