Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

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

diff --git a/include/asm-x86/idle.h b/arch/x86/include/asm/idle.h
similarity index 76%
rename from include/asm-x86/idle.h
rename to arch/x86/include/asm/idle.h
index 32227f0188dde8ef9d7de11f845a5d79c8b97953..44c89c3a23e9a1f9507536b4d84f0f6b3d225c61 100644 (file)
--- a/include/asm-x86/idle.h
+++ b/arch/x86/include/asm/idle.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__IDLE_H
-#define ASM_X86__IDLE_H
+#ifndef _ASM_X86_IDLE_H
+#define _ASM_X86_IDLE_H
 
 #define IDLE_START 1
 #define IDLE_END 2
@@ -13,4 +13,4 @@ void exit_idle(void);
 
 void c1e_remove_cpu(int cpu);
 
-#endif /* ASM_X86__IDLE_H */
+#endif /* _ASM_X86_IDLE_H */