aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-14 09:13:47 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-14 09:13:47 -0400
commit881b374705f352725ba1f558968ef34c17ba900e (patch)
treed7286c00d109db65662af1435fe3b5c8868814d2 /arch/x86/pci
parentc83d12806b6185131ece682de8696d8cfb78df69 (diff)
parentd4c63ec060f3315653c0ae5bc3a7fe2419a2282f (diff)
Merge branch 'x86/apic' into x86/core
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/acpi.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 19af06927fbc..1d88d2b39771 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -250,10 +250,5 @@ int __init pci_acpi_init(void)
250 acpi_pci_irq_enable(dev); 250 acpi_pci_irq_enable(dev);
251 } 251 }
252 252
253#ifdef CONFIG_X86_IO_APIC
254 if (acpi_ioapic)
255 print_IO_APIC();
256#endif
257
258 return 0; 253 return 0;
259} 254}