[ACPI] delete CONFIG_ACPI_BUS

[linux-2.6] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 66c60982ba4677421c351447fca646d0c451d711..8cafa4adcf49ae558d0cc1fd999a5ef83d803d58 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -43,16 +43,6 @@ config ACPI
 
 if ACPI
 
-config ACPI_BOOT
-       bool
-       default y
-
-config ACPI_INTERPRETER
-       bool
-       default y
-
-if ACPI_INTERPRETER
-
 config ACPI_SLEEP
        bool "Sleep States (EXPERIMENTAL)"
        depends on X86 && (!SMP || SUSPEND_SMP)
@@ -130,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
@@ -261,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
@@ -279,10 +267,6 @@ config ACPI_DEBUG
          of verbosity. Saying Y enables these statements. This will increase
          your kernel size by around 50K.
 
-config ACPI_BUS
-       bool
-       default y
-
 config ACPI_EC
        bool
        depends on X86
@@ -307,12 +291,10 @@ 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
-       depends on ACPI_BOOT && EXPERIMENTAL
+       depends on EXPERIMENTAL
        depends on !X86_64
        default n
        help