summaryrefslogtreecommitdiffstats
path: root/arch/i386/pci
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-25 12:27:09 -0400
committerLen Brown <len.brown@intel.com>2005-08-25 12:40:44 -0400
commit6153df7b2f4d27c8bde054db1b947369a6f64d83 (patch)
tree2e30598ad48d05d0ea956b6097e0943a178d6299 /arch/i386/pci
parent07fefe4ca93b3e45b2bea32871a4496067888852 (diff)
[ACPI] delete CONFIG_ACPI_PCI
Delete the ability to build an ACPI kernel that does not include PCI support. When such a machine is created and it requires a tuned kernel, send a patch. http://bugzilla.kernel.org/show_bug.cgi?id=1364 Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/pci')
-rw-r--r--arch/i386/pci/Makefile2
-rw-r--r--arch/i386/pci/irq.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
index 1bff03f3696..ead6122dd06 100644
--- a/arch/i386/pci/Makefile
+++ b/arch/i386/pci/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
pci-y := fixup.o
-pci-$(CONFIG_ACPI_PCI) += acpi.o
+pci-$(CONFIG_ACPI) += acpi.o
pci-y += legacy.o irq.o
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 86348b68fda..326a2edc383 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -1075,7 +1075,7 @@ static void pirq_penalize_isa_irq(int irq, int active)
void pcibios_penalize_isa_irq(int irq, int active)
{
-#ifdef CONFIG_ACPI_PCI
+#ifdef CONFIG_ACPI
if (!acpi_noirq)
acpi_penalize_isa_irq(irq, active);
else