aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-13 09:45:42 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-13 09:45:42 +0100
commit881c47760bc66b43360337da37d2a9de4af865b0 (patch)
tree38af5266dd10cbaf838f18e826871a351ea2582a /arch/x86
parentab639f3593f0b5e4439d549831442c18c3baf989 (diff)
parent891393745aad5c5acdb01b6ce61c08d4cc064649 (diff)
Merge branch 'x86/cleanups' into x86/core
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/io.h1
-rw-r--r--arch/x86/include/asm/io_32.h2
-rw-r--r--arch/x86/include/asm/io_64.h2
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index bcf7ea4e136..f710ec2370e 100644
--- 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
index d8e242e1b39..e08d8ed05a1 100644
--- 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
index 563c16270ba..1131d8ea2c6 100644
--- 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>