diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/x86/pci/acpi.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/x86/pci/acpi.c')
| -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 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 | } |