Merge commit 'v2.6.28-rc9' into x86/apic

[sfrench/cifs-2.6.git] / arch / x86 / kernel / apic.c

diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 1d410ee4b06467cd79fc25d083783419014585c4..fc26ff390f1424cfda1e5e73c209db3fae2233b7 100644 (file)
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1309,7 +1309,7 @@ void enable_x2apic(void)
        }
 }
 
-void enable_IR_x2apic(void)
+void __init enable_IR_x2apic(void)
 {
 #ifdef CONFIG_INTR_REMAP
        int ret;