aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/io.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-13 03:45:42 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-13 03:45:42 -0500
commit881c47760bc66b43360337da37d2a9de4af865b0 (patch)
tree38af5266dd10cbaf838f18e826871a351ea2582a /arch/x86/include/asm/io.h
parentab639f3593f0b5e4439d549831442c18c3baf989 (diff)
parent891393745aad5c5acdb01b6ce61c08d4cc064649 (diff)
Merge branch 'x86/cleanups' into x86/core
Diffstat (limited to 'arch/x86/include/asm/io.h')
-rw-r--r--arch/x86/include/asm/io.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index bcf7ea4e1367..f710ec2370e7 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);
105extern void early_iounmap(void __iomem *addr, unsigned long size); 105extern void early_iounmap(void __iomem *addr, unsigned long size);
106extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); 106extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
107 107
108#define IO_SPACE_LIMIT 0xffff
108 109
109#endif /* _ASM_X86_IO_H */ 110#endif /* _ASM_X86_IO_H */