Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / include / asm-x86 / idle.h

diff --git a/include/asm-x86/idle.h b/include/asm-x86/idle.h
index 6bd47dc..cbb6491 100644 (file)
--- a/include/asm-x86/idle.h
+++ b/include/asm-x86/idle.h
@@ -6,9 +6,10 @@
 
 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);
 
+void c1e_remove_cpu(int cpu);
+
 #endif