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

2008-12-23 16:23:23 +01:00
parent a98f8fd24f 929096fe9f
commit 1ccedb7cdb
1204 changed files with 31039 additions and 13422 deletions
--- 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;