[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>

1 files changed, 0 insertions, 9 deletions

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 552fc85691ac..0fb23c30eb98 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -66,13 +66,8 @@ static inline int ioapic_setup_disabled(void)
 
 #define PREFIX                  "ACPI: "
 
-#ifdef CONFIG_ACPI_PCI
 int acpi_noirq __initdata;      /* skip ACPI IRQ initialization */
 int acpi_pci_disabled __initdata;       /* skip ACPI PCI scan and IRQ initialization */
-#else
-int acpi_noirq __initdata = 1;
-int acpi_pci_disabled __initdata = 1;
-#endif
 int acpi_ht __initdata = 1;     /* enable HT */
 
 int acpi_lapic;
@@ -849,7 +844,6 @@ extern int acpi_force;
 
 #ifdef __i386__
 
-#ifdef  CONFIG_ACPI_PCI
 static int __init disable_acpi_irq(struct dmi_system_id *d)
 {
         if (!acpi_force) {
@@ -869,7 +863,6 @@ static int __init disable_acpi_pci(struct dmi_system_id *d)
         }
         return 0;
 }
-#endif
 
 static int __init dmi_disable_acpi(struct dmi_system_id *d)
 {
@@ -1017,7 +1010,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
                      },
          },
 
-#ifdef  CONFIG_ACPI_PCI
         /*
          * Boxes that need ACPI PCI IRQ routing disabled
          */
@@ -1055,7 +1047,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
                      DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
                      },
          },
-#endif
         {}
 };