Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638

[karo-tx-linux.git] / arch / s390 / kernel / crash.c

diff --git a/arch/s390/kernel/crash.c b/arch/s390/kernel/crash.c
index db38283c1f276a3bd400e6fb9f52413783d672ca..8cc7c9fa64f5fe6e8834e1b7190b831d885cf1ac 100644 (file)
--- a/arch/s390/kernel/crash.c
+++ b/arch/s390/kernel/crash.c
@@ -9,9 +9,8 @@
 
 #include <linux/threads.h>
 #include <linux/kexec.h>
+#include <linux/reboot.h>
 
-note_buf_t crash_notes[NR_CPUS];
-
-void machine_crash_shutdown(void)
+void machine_crash_shutdown(struct pt_regs *regs)
 {
 }