Merge branch 'linus' into x86/core

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

diff --git a/include/asm-x86/idle.h b/include/asm-x86/idle.h
index 6bd47dcf2067ce70e8569da825fc55787420b9a1..dc9c7944847baf227806d9ce7130497c860d60ec 100644 (file)
--- a/include/asm-x86/idle.h
+++ b/include/asm-x86/idle.h
@@ -1,14 +1,13 @@
-#ifndef _ASM_X86_64_IDLE_H
-#define _ASM_X86_64_IDLE_H 1
+#ifndef ASM_X86__IDLE_H
+#define ASM_X86__IDLE_H
 
 #define IDLE_START 1
 #define IDLE_END 2
 
 struct notifier_block;
 void idle_notifier_register(struct notifier_block *n);
-void idle_notifier_unregister(struct notifier_block *n);
 
 void enter_idle(void);
 void exit_idle(void);
 
-#endif
+#endif /* ASM_X86__IDLE_H */