[ACPI] delete CONFIG_ACPI_BUS

it is a synonym for CONFIG_ACPI

Signed-off-by: Len Brown <len.brown@intel.com>

3 files changed, 0 insertions, 11 deletions

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index f137a32634ac..1a387856c870 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -142,7 +142,6 @@ CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
 CONFIG_ACPI_PCI=y
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 84befaecedf8..552fc85691ac 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -408,8 +408,6 @@ acpi_parse_nmi_src(acpi_table_entry_header * header, const unsigned long end)
 
 #endif                          /* CONFIG_X86_IO_APIC */
 
-#ifdef  CONFIG_ACPI_BUS
-
 /*
  * acpi_pic_sci_set_trigger()
  * 
@@ -460,8 +458,6 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
         outb(new >> 8, 0x4d1);
 }
 
-#endif                          /* CONFIG_ACPI_BUS */
-
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 {
 #ifdef CONFIG_X86_IO_APIC
@@ -637,12 +633,10 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
         /* initialize sci_int early for INT_SRC_OVR MADT parsing */
         acpi_fadt.sci_int = fadt->sci_int;
 
-#ifdef CONFIG_ACPI_BUS
         /* initialize rev and apic_phys_dest_mode for x86_64 genapic */
         acpi_fadt.revision = fadt->revision;
         acpi_fadt.force_apic_physical_destination_mode =
             fadt->force_apic_physical_destination_mode;
-#endif
 
 #ifdef CONFIG_X86_PM_TIMER
         /* detect the location of the ACPI PM Timer */
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index db90d141481d..97dbf289dbd5 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -1069,11 +1069,9 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
          */
         static int              gsi_to_irq[MAX_GSI_NUM];
 
-#ifdef CONFIG_ACPI_BUS
         /* Don't set up the ACPI SCI because it's already set up */
         if (acpi_fadt.sci_int == gsi)
                 return gsi;
-#endif
 
         ioapic = mp_find_ioapic(gsi);
         if (ioapic < 0) {
@@ -1116,13 +1114,11 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
                 if (gsi < MAX_GSI_NUM) {
                         if (gsi > 15)
                                 gsi = pci_irq++;
-#ifdef CONFIG_ACPI_BUS
                         /*
                          * Don't assign IRQ used by ACPI SCI
                          */
                         if (gsi == acpi_fadt.sci_int)
                                 gsi = pci_irq++;
-#endif
                         gsi_to_irq[irq] = gsi;
                 } else {
                         printk(KERN_ERR "GSI %u is too high\n", gsi);