diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
tree | 0f5fc519a68faca5318c296315c9b6c502907056 /arch/x86/kernel/apic.c | |
parent | a98f8fd24fb24fcb9a359553e64dd6aac5cf4279 (diff) | |
parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) |
Merge commit 'v2.6.28-rc9' into x86/apic
Diffstat (limited to 'arch/x86/kernel/apic.c')
-rw-r--r-- | arch/x86/kernel/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 1d410ee4b064..fc26ff390f14 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
@@ -1309,7 +1309,7 @@ void enable_x2apic(void) | |||
1309 | } | 1309 | } |
1310 | } | 1310 | } |
1311 | 1311 | ||
1312 | void enable_IR_x2apic(void) | 1312 | void __init enable_IR_x2apic(void) |
1313 | { | 1313 | { |
1314 | #ifdef CONFIG_INTR_REMAP | 1314 | #ifdef CONFIG_INTR_REMAP |
1315 | int ret; | 1315 | int ret; |