diff --git a/[refs] b/[refs]
index 748bd5c7ed51..61ce8dc65645 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70ec9054e7a65c878298666083f7d5b70ccf9032
+refs/heads/master: f8cd170dabeca90c976e6487ba7a8a7752aae571
diff --git a/trunk/arch/mips/lantiq/falcon/prom.c b/trunk/arch/mips/lantiq/falcon/prom.c
index c1d278f05a3a..aa9497947859 100644
--- a/trunk/arch/mips/lantiq/falcon/prom.c
+++ b/trunk/arch/mips/lantiq/falcon/prom.c
@@ -8,6 +8,8 @@
  */
 
 #include <linux/kernel.h>
+#include <asm/cacheflush.h>
+#include <asm/traps.h>
 #include <asm/io.h>
 
 #include <lantiq_soc.h>
@@ -84,4 +86,7 @@ void __init ltq_soc_detect(struct ltq_soc_info *i)
 		unreachable();
 		break;
 	}
+
+	board_nmi_handler_setup = ltq_soc_nmi_setup;
+	board_ejtag_handler_setup = ltq_soc_ejtag_setup;
 }