Merge branch 'x86/pebs' into x86/unify-cpu-detect

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

diff --git a/include/asm-x86/ds.h b/include/asm-x86/ds.h
index 72c5a190bf48076d8b99b9f42f8a6f7a16a0e009..c3c953a45b215ba24b3c4216f4ee9def2e1f7c08 100644 (file)
--- a/include/asm-x86/ds.h
+++ b/include/asm-x86/ds.h
@@ -20,8 +20,8 @@
  * Markus Metzger <markus.t.metzger@intel.com>, 2007-2008
  */
 
-#ifndef _ASM_X86_DS_H
-#define _ASM_X86_DS_H
+#ifndef ASM_X86__DS_H
+#define ASM_X86__DS_H
 
 #ifdef CONFIG_X86_DS
 
@@ -235,4 +235,4 @@ extern void ds_free(struct ds_context *context);
 #define ds_init_intel(config) do {} while (0)
 
 #endif /* CONFIG_X86_DS */
-#endif /* _ASM_X86_DS_H */
+#endif /* ASM_X86__DS_H */