diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 15:13:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 15:13:47 +0200 |
| commit | 881b374705f352725ba1f558968ef34c17ba900e (patch) | |
| tree | d7286c00d109db65662af1435fe3b5c8868814d2 /arch/x86/pci | |
| parent | c83d12806b6185131ece682de8696d8cfb78df69 (diff) | |
| parent | d4c63ec060f3315653c0ae5bc3a7fe2419a2282f (diff) | |
| download | linux-3.10-881b374705f352725ba1f558968ef34c17ba900e.tar.gz linux-3.10-881b374705f352725ba1f558968ef34c17ba900e.tar.bz2 linux-3.10-881b374705f352725ba1f558968ef34c17ba900e.zip | |
Merge branch 'x86/apic' into x86/core
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/acpi.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 19af06927fb..1d88d2b3977 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -250,10 +250,5 @@ int __init pci_acpi_init(void) acpi_pci_irq_enable(dev); } -#ifdef CONFIG_X86_IO_APIC - if (acpi_ioapic) - print_IO_APIC(); -#endif - return 0; } |