15 files changed, 13 insertions, 43 deletions

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 1c0076e22dda..f137a32634ac 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -131,7 +131,6 @@ CONFIG_SOFTWARE_SUSPEND=y
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 CONFIG_ACPI=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SLEEP_PROC_FS=y
 CONFIG_ACPI_AC=y
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 09700d894668..84befaecedf8 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -303,7 +303,7 @@ acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)
 
 #endif                          /*CONFIG_X86_LOCAL_APIC */
 
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+#ifdef CONFIG_X86_IO_APIC
 
 static int __init
 acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
@@ -634,10 +634,8 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
                 printk(KERN_WARNING PREFIX "Unable to map FADT\n");
                 return 0;
         }
-#ifdef  CONFIG_ACPI_INTERPRETER
         /* initialize sci_int early for INT_SRC_OVR MADT parsing */
         acpi_fadt.sci_int = fadt->sci_int;
-#endif
 
 #ifdef CONFIG_ACPI_BUS
         /* initialize rev and apic_phys_dest_mode for x86_64 genapic */
@@ -735,7 +733,7 @@ static int __init acpi_parse_madt_lapic_entries(void)
 }
 #endif                          /* CONFIG_X86_LOCAL_APIC */
 
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+#ifdef  CONFIG_X86_IO_APIC
 /*
  * Parse IOAPIC related entries in MADT
  * returns 0 on success, < 0 on error
@@ -810,7 +808,7 @@ static inline int acpi_parse_madt_ioapic_entries(void)
 {
         return -1;
 }
-#endif                          /* !(CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER) */
+#endif  /* !CONFIG_X86_IO_APIC */
 
 static void __init acpi_process_madt(void)
 {
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 9a4db7d30001..db90d141481d 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -854,7 +854,7 @@ void __init mp_register_lapic (
         MP_processor_info(&processor);
 }
 
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+#ifdef  CONFIG_X86_IO_APIC
 
 #define MP_ISA_BUS              0
 #define MP_MAX_IOAPIC_PIN       127
@@ -1136,5 +1136,5 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
         return gsi;
 }
 
-#endif /* CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER */
+#endif /* CONFIG_X86_IO_APIC */
 #endif /* CONFIG_ACPI */
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index d3943e5edc8f..d52eda399a7a 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(boot_cpu_data);
 
 unsigned long mmu_cr4_features;
 
-#ifdef  CONFIG_ACPI_INTERPRETER
+#ifdef  CONFIG_ACPI
         int acpi_disabled = 0;
 #else
         int acpi_disabled = 1;
diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/i386/mach-es7000/es7000plat.c
index baac9da042ce..f549c0efdb9f 100644
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
@@ -51,7 +51,7 @@ struct mip_reg		*host_reg;
 int                     mip_port;
 unsigned long           mip_addr, host_addr;
 
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
 
 /*
  * GSI override for ES7000 platforms.
@@ -73,7 +73,7 @@ es7000_rename_gsi(int ioapic, int gsi)
         return gsi;
 }
 
-#endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER)
+#endif  /* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */
 
 /*
  * Parse the OEM Table
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig
index 456c65689bef..2c3ba6a6ec7f 100644
--- a/arch/ia64/configs/bigsur_defconfig
+++ b/arch/ia64/configs/bigsur_defconfig
@@ -107,7 +107,6 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index dc483c18343f..6a0c114e086a 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -130,7 +130,6 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_INTERPRETER=y
 # CONFIG_ACPI_BUTTON is not set
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_HOTKEY=m
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index cd2d6375a853..dec24a6de6a4 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -128,7 +128,6 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=m
 # CONFIG_ACPI_VIDEO is not set
 # CONFIG_ACPI_HOTKEY is not set
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index cf58404769a8..d318087bfcbd 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -128,7 +128,6 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_HOTKEY=m
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index f38c677f7afd..e6d34df7d2ff 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -118,7 +118,6 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index aed77c1c5ccc..8ccb4a12eed5 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -135,7 +135,6 @@ CONFIG_PM_STD_PARTITION=""
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 CONFIG_ACPI=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 14b70c259f3e..f023a88ca398 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -43,12 +43,6 @@ config ACPI
 
 if ACPI
 
-config ACPI_INTERPRETER
-        bool
-        default y
-
-if ACPI_INTERPRETER
-
 config ACPI_SLEEP
         bool "Sleep States (EXPERIMENTAL)"
         depends on X86 && (!SMP || SUSPEND_SMP)
@@ -126,7 +120,6 @@ config ACPI_VIDEO
 
 config ACPI_HOTKEY
         tristate "Generic Hotkey"
-        depends on ACPI_INTERPRETER
         depends on EXPERIMENTAL
         depends on !IA64_SGI_SN
         default n
@@ -257,7 +250,6 @@ config ACPI_CUSTOM_DSDT_FILE
 
 config ACPI_BLACKLIST_YEAR
         int "Disable ACPI for systems before Jan 1st this year"
-        depends on ACPI_INTERPRETER
         default 0
         help
           enter a 4-digit year, eg. 2001 to disable ACPI by default
@@ -303,8 +295,6 @@ config ACPI_SYSTEM
           This driver will enable your system to shut down using ACPI, and
           dump your ACPI DSDT table using /proc/acpi/dsdt.
 
-endif   # ACPI_INTERPRETER
-
 config X86_PM_TIMER
         bool "Power Management Timer Support"
         depends on X86
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 952ab352af9e..060afaf962a3 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -16,12 +16,12 @@ EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
 # ACPI Boot-Time Table Parsing
 #
 obj-y                           += tables.o
-obj-$(CONFIG_ACPI_INTERPRETER)  += blacklist.o
+obj-y                           += blacklist.o
 
 #
 # ACPI Core Subsystem (Interpreter)
 #
-obj-$(CONFIG_ACPI_INTERPRETER)  += osl.o utils.o \
+obj-y                           += osl.o utils.o \
                                    dispatcher/ events/ executer/ hardware/ \
                                    namespace/ parser/ resources/ tables/ \
                                    utilities/
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index a44b97304e95..c51b02d9dfd0 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -986,7 +986,7 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for"
 #define IPMI_MEM_ADDR_SPACE 1
 #define IPMI_IO_ADDR_SPACE  2
 
-#if defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_X86) || defined(CONFIG_PCI)
+#if defined(CONFIG_ACPI) || defined(CONFIG_X86) || defined(CONFIG_PCI)
 static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr)
 {
         int i;
@@ -1362,7 +1362,7 @@ static int try_init_mem(int intf_num, struct smi_info **new_info)
 }
 
 
-#ifdef CONFIG_ACPI_INTERPRETER
+#ifdef CONFIG_ACPI
 
 #include <linux/acpi.h>
 
@@ -2067,7 +2067,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi)
         rv = try_init_mem(intf_num, &new_smi);
         if (rv)
                 rv = try_init_port(intf_num, &new_smi);
-#ifdef CONFIG_ACPI_INTERPRETER
+#ifdef CONFIG_ACPI
         if ((rv) && (si_trydefaults)) {
                 rv = try_init_acpi(intf_num, &new_smi);
         }
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fa1ad1a60a09..6882b32aa40f 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -488,20 +488,9 @@ extern int ec_write(u8 addr, u8 val);
 
 #endif /*CONFIG_ACPI_EC*/
 
-#ifdef CONFIG_ACPI_INTERPRETER
-
 extern int acpi_blacklisted(void);
 extern void acpi_bios_year(char *s);
 
-#else /*!CONFIG_ACPI_INTERPRETER*/
-
-static inline int acpi_blacklisted(void)
-{
-        return 0;
-}
-
-#endif /*!CONFIG_ACPI_INTERPRETER*/
-
 #define ACPI_CSTATE_LIMIT_DEFINED       /* for driver builds */
 #ifdef  CONFIG_ACPI