Merge branch 'x86/cpu' into x86/xsave

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

diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h
index 0f954dc89cb3c537ebb444e402987616b0a9714b..688f8a4085a48e4d000507d8c20605a71a698016 100644 (file)
--- a/include/asm-x86/io.h
+++ b/include/asm-x86/io.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_IO_H
-#define _ASM_X86_IO_H
+#ifndef ASM_X86__IO_H
+#define ASM_X86__IO_H
 
 #define ARCH_HAS_IOREMAP_WC
 
@@ -99,4 +99,4 @@ extern void early_iounmap(void *addr, unsigned long size);
 extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
 
 
-#endif /* _ASM_X86_IO_H */
+#endif /* ASM_X86__IO_H */