Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / uv / bios.h

diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h
index 28364396cf6b0198b00a8e2b56b223dd13fdb164..d931d3b7e6f71b394d87f5766835dd8ef892dfec 100644 (file)
--- a/arch/x86/include/asm/uv/bios.h
+++ b/arch/x86/include/asm/uv/bios.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_UV__BIOS_H
-#define _ASM_X86_UV__BIOS_H
+#ifndef _ASM_X86_UV_BIOS_H
+#define _ASM_X86_UV_BIOS_H
 
 /*
  * UV BIOS layer definitions.
@@ -91,4 +91,4 @@ extern long uv_region_size;
 
 extern struct kobject *sgi_uv_kobj;    /* /sys/firmware/sgi_uv */
 
-#endif /* _ASM_X86_UV__BIOS_H */
+#endif /* _ASM_X86_UV_BIOS_H */