[ACPI] delete CONFIG_ACPI_INTERPRETER

it is a synonym for CONFIG_ACPI

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

3 files changed, 5 insertions, 15 deletions

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);
         }