summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/io_apic.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-09-08 23:03:30 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-09-08 23:03:30 +0100
commit223176bc722a7bf519904180e956292ae1d1e819 (patch)
tree75b84d09c4b6eed81e537a4e587236f05faa5b7d /include/asm-x86_64/io_apic.h
parent7d333d6c739a5cd6d60102ea1a9940cbbb0546ec (diff)
parent1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff)
downloadop-kernel-dev-223176bc722a7bf519904180e956292ae1d1e819.zip
op-kernel-dev-223176bc722a7bf519904180e956292ae1d1e819.tar.gz
Merge branch 'master' of /usr/src/linux-2.6
Diffstat (limited to 'include/asm-x86_64/io_apic.h')
-rw-r--r--include/asm-x86_64/io_apic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h
index a8babd2..ee1bc69 100644
--- a/include/asm-x86_64/io_apic.h
+++ b/include/asm-x86_64/io_apic.h
@@ -201,7 +201,7 @@ extern int skip_ioapic_setup;
*/
#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
extern int io_apic_get_version (int ioapic);
extern int io_apic_get_redir_entries (int ioapic);
extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int);
OpenPOWER on IntegriCloud