Merge branch 'linus' into cpumask-for-linus
[linux-2.6.git] / arch / x86 / kernel / cpu / mcheck / mce_intel_64.c
index 96b2a85..d6b72df 100644 (file)
@@ -270,7 +270,7 @@ void cmci_reenable(void)
                cmci_discover(banks, 0);
 }
 
-static __cpuinit void intel_init_cmci(void)
+static void intel_init_cmci(void)
 {
        int banks;