powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / io.h

diff --git a/include/asm-ppc64/io.h b/include/asm-powerpc/io.h
similarity index 98%
rename from include/asm-ppc64/io.h
rename to include/asm-powerpc/io.h
index 77fc07c3c6bd1868e9fe21b75e4a28c88b795a76..48938d84d055e89086b8665879ce47810e3926d4 100644 (file)
--- a/include/asm-ppc64/io.h
+++ b/include/asm-powerpc/io.h
@@ -1,5 +1,5 @@
-#ifndef _PPC64_IO_H
-#define _PPC64_IO_H
+#ifndef _ASM_POWERPC_IO_H
+#define _ASM_POWERPC_IO_H
 
 /* 
  * This program is free software; you can redistribute it and/or
@@ -8,7 +8,10 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
+#ifndef CONFIG_PPC64
+#include <asm-ppc/io.h>
+#else
+
 #include <linux/compiler.h>
 #include <asm/page.h>
 #include <asm/byteorder.h>
@@ -455,4 +458,5 @@ extern int check_legacy_ioport(unsigned long base_port);
 
 #endif /* __KERNEL__ */
 
-#endif /* _PPC64_IO_H */
+#endif /* CONFIG_PPC64 */
+#endif /* _ASM_POWERPC_IO_H */