Merge master.kernel.org:/home/rmk/linux-2.6-arm

[mv-sheeva.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 6ceb664fb52aec50c9c2d922c5c8cf17ad5979b2..525e365f72390bb3fb4601c0be4c4bd81214eceb 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -21,7 +21,6 @@
 #include <linux/debug_locks.h>
 
 int panic_on_oops;
-int panic_on_unrecovered_nmi;
 int tainted;
 static int pause_on_oops;
 static int pause_on_oops_flag;