Merge branch 'x86/cleanups' into x86/core

mariux64 · Feb 13, 2009 · 881c477 · 881c477
2 parents ab639f3 + 8913937
commit 881c477
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
@@ -105,5 +105,6 @@ extern void __iomem *early_memremap(unsigned long offset, unsigned long size);
 extern void early_iounmap(void __iomem *addr, unsigned long size);
 extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
 
+#define IO_SPACE_LIMIT 0xffff
 
 #endif /* _ASM_X86_IO_H */
diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h
@@ -37,8 +37,6 @@
   *  - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
   */
 
-#define IO_SPACE_LIMIT 0xffff
-
 #define XQUAD_PORTIO_BASE 0xfe400000
 #define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */
 

diff --git a/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h
@@ -136,8 +136,6 @@ __OUTS(b)
 __OUTS(w)
 __OUTS(l)
 
-#define IO_SPACE_LIMIT 0xffff
-
 #if defined(__KERNEL__) && defined(__x86_64__)
 
 #include <linux/vmalloc.h>