Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index d8a0bca21233e12d413fa9ab60c436b9b36e0db7..9b8dcfd1ca931e6f728c79655e4edead123a0f11 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -18,6 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/nmi.h>
 #include <linux/kexec.h>
+#include <linux/debug_locks.h>
 
 int panic_on_oops;
 int tainted;