diff --git a/[refs] b/[refs]
index d3bcc4b3ea49..288c290644d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7bc537db9e13adee1f294aa370f16d80f40b73d
+refs/heads/master: aaba6d4bf6f2a52a0c30ad1da4374ba24bd7163b
diff --git a/trunk/arch/i386/mach-default/setup.c b/trunk/arch/i386/mach-default/setup.c
index c511705c386c..cc2f519b2f7f 100644
--- a/trunk/arch/i386/mach-default/setup.c
+++ b/trunk/arch/i386/mach-default/setup.c
@@ -102,7 +102,7 @@ void __init time_init_hook(void)
  *	along the MCA bus.  Use this to hook into that chain if you will need
  *	it.
  **/
-void __init mca_nmi_hook(void)
+void mca_nmi_hook(void)
 {
 	/* If I recall correctly, there's a whole bunch of other things that
 	 * we can do to check for NMI problems, but that's all I know about