1 files changed, 9 insertions, 100 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index f4f632917509..a7799a99f2d9 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -9,6 +9,7 @@ menuconfig ACPI
         depends on PCI
         depends on PM
         select PNP
+        select CPU_IDLE
         default y
         ---help---
           Advanced Configuration and Power Interface (ACPI) support for 
@@ -196,90 +197,6 @@ config ACPI_NUMA
         depends on (X86 || IA64)
         default y if IA64_GENERIC || IA64_SGI_SN2
 
-config ACPI_WMI
-        tristate "WMI (EXPERIMENTAL)"
-        depends on X86
-        depends on EXPERIMENTAL
-        help
-          This driver adds support for the ACPI-WMI (Windows Management
-          Instrumentation) mapper device (PNP0C14) found on some systems.
-
-          ACPI-WMI is a proprietary extension to ACPI to expose parts of the
-          ACPI firmware to userspace - this is done through various vendor
-          defined methods and data blocks in a PNP0C14 device, which are then
-          made available for userspace to call.
-
-          The implementation of this in Linux currently only exposes this to
-          other kernel space drivers.
-
-          This driver is a required dependency to build the firmware specific
-          drivers needed on many machines, including Acer and HP laptops.
-
-          It is safe to enable this driver even if your DSDT doesn't define
-          any ACPI-WMI devices.
-
-config ACPI_ASUS
-        tristate "ASUS/Medion Laptop Extras"
-        depends on X86
-        select BACKLIGHT_CLASS_DEVICE
-        ---help---
-          This driver provides support for extra features of ACPI-compatible
-          ASUS laptops. As some of Medion laptops are made by ASUS, it may also
-          support some Medion laptops (such as 9675 for example).  It makes all
-          the extra buttons generate standard ACPI events that go through
-          /proc/acpi/events, and (on some models) adds support for changing the
-          display brightness and output, switching the LCD backlight on and off,
-          and most importantly, allows you to blink those fancy LEDs intended
-          for reporting mail and wireless status.
-
-          Note: display switching code is currently considered EXPERIMENTAL,
-          toying with these values may even lock your machine.
-
-          All settings are changed via /proc/acpi/asus directory entries. Owner
-          and group for these entries can be set with asus_uid and asus_gid
-          parameters.
-
-          More information and a userspace daemon for handling the extra buttons
-          at <http://sourceforge.net/projects/acpi4asus/>.
-
-          If you have an ACPI-compatible ASUS laptop, say Y or M here. This
-          driver is still under development, so if your laptop is unsupported or
-          something works not quite as expected, please use the mailing list
-          available on the above page (acpi4asus-user@lists.sourceforge.net).
-
-          NOTE: This driver is deprecated and will probably be removed soon,
-          use asus-laptop instead.
-
-config ACPI_TOSHIBA
-        tristate "Toshiba Laptop Extras"
-        depends on X86 && INPUT
-        select INPUT_POLLDEV
-        select NET
-        select RFKILL
-        select BACKLIGHT_CLASS_DEVICE
-        ---help---
-          This driver adds support for access to certain system settings
-          on "legacy free" Toshiba laptops.  These laptops can be recognized by
-          their lack of a BIOS setup menu and APM support.
-
-          On these machines, all system configuration is handled through the
-          ACPI.  This driver is required for access to controls not covered
-          by the general ACPI drivers, such as LCD brightness, video output,
-          etc.
-
-          This driver differs from the non-ACPI Toshiba laptop driver (located
-          under "Processor type and features") in several aspects.
-          Configuration is accessed by reading and writing text files in the
-          /proc tree instead of by program interface to /dev.  Furthermore, no
-          power management functions are exposed, as those are handled by the
-          general ACPI drivers.
-
-          More information about this driver is available at
-          <http://memebeam.org/toys/ToshibaAcpiDriver>.
-
-          If you have a legacy free Toshiba laptop (such as the Libretto L1
-          series), say Y.
-
 config ACPI_CUSTOM_DSDT_FILE
         string "Custom DSDT Table file to include"
         default ""
@@ -312,9 +229,13 @@ config ACPI_DEBUG
         bool "Debug Statements"
         default n
         help
-          The ACPI driver can optionally report errors with a great deal
-          of verbosity. Saying Y enables these statements. This will increase
-          your kernel size by around 50K.
+          The ACPI subsystem can produce debug output.  Saying Y enables this
+          output and increases the kernel size by around 50K.
+
+          Use the acpi.debug_layer and acpi.debug_level kernel command-line
+          parameters documented in Documentation/acpi/debug.txt and
+          Documentation/kernel-parameters.txt to control the type and
+          amount of debug output.
 
 config ACPI_DEBUG_FUNC_TRACE
         bool "Additionally enable ACPI function tracing"
@@ -324,14 +245,6 @@ config ACPI_DEBUG_FUNC_TRACE
           ACPI Debug Statements slow down ACPI processing. Function trace
           is about half of the penalty and is rarely useful.
 
-config ACPI_EC
-        bool
-        default y
-        help
-          This driver is required on some systems for the proper operation of
-          the battery and thermal drivers.  If you are compiling for a 
-          mobile system, say Y.
-
 config ACPI_PCI_SLOT
         tristate "PCI slot detection driver"
         default n
@@ -341,10 +254,6 @@ config ACPI_PCI_SLOT
           help you correlate PCI bus addresses with the physical geography
           of your slots. If you are unsure, say N.
 
-config ACPI_POWER
-        bool
-        default y
-
 config ACPI_SYSTEM
         bool
         default y
@@ -379,7 +288,7 @@ config ACPI_CONTAINER
           support physical cpu/memory hot-plug.
 
           If one selects "m", this driver can be loaded with
-          "modprobe acpi_container".
+          "modprobe container".
 
 config ACPI_HOTPLUG_MEMORY
         tristate "Memory Hotplug"