Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 9dfa3ee769ae2c02846a19a8f4a7b727a78baf33..44153fdf73fc0787072b21c043713f0fb62815a5 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -17,7 +17,6 @@ extern void cpu_idle(void);
 #include <linux/compiler.h>
 #include <linux/thread_info.h>
 #include <asm/smp.h>
-#include <asm/bug.h>
 
 /*
  * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc.