1 files changed, 30 insertions, 53 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index ba13896cae40..3998c9d35fe1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,7 +3,6 @@
 #
 
 menu "ACPI (Advanced Configuration and Power Interface) Support"
-        depends on PM
         depends on !X86_VISWS
         depends on !IA64_HP_SIM
         depends on IA64 || X86
@@ -11,6 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"
 config ACPI
         bool "ACPI Support"
         depends on IA64 || X86
+        select PM
+        select PCI
 
         default y
         ---help---
@@ -43,20 +44,10 @@ 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)"
+        bool "Sleep States"
         depends on X86 && (!SMP || SUSPEND_SMP)
-        depends on EXPERIMENTAL && PM
+        depends on PM
         default y
         ---help---
           This option adds support for ACPI suspend states. 
@@ -90,16 +81,16 @@ config ACPI_SLEEP_PROC_SLEEP
 config ACPI_AC
         tristate "AC Adapter"
         depends on X86
-        default m
+        default y
         help
           This driver adds support for the AC Adapter object, which indicates
-          whether a system is on AC, or not.  Typically, only mobile systems 
-          have this object, since desktops are always on AC.
+          whether a system is on AC, or not. If you have a system that can
+          switch between A/C and battery, say Y.
 
 config ACPI_BATTERY
         tristate "Battery"
         depends on X86
-        default m
+        default y
         help
           This driver adds support for battery information through
           /proc/acpi/battery. If you have a mobile system with a battery, 
@@ -107,18 +98,17 @@ config ACPI_BATTERY
 
 config ACPI_BUTTON
         tristate "Button"
-        default m
+        default y
         help
-          This driver registers for events based on buttons, such as the
-          power, sleep, and lid switch.  In the future, a daemon will read
-          /proc/acpi/event and perform user-defined actions such as shutting
-          down the system.  Until then, you can cat it, and see output when
-          a button is pressed.
+          This driver handles events on the power, sleep and lid buttons.
+          A daemon reads /proc/acpi/event and perform user-defined actions
+          such as shutting down the system.  This is necessary for
+          software controlled poweroff.
 
 config ACPI_VIDEO
         tristate "Video"
-        depends on EXPERIMENTAL
-        default m
+        depends on X86
+        default y
         help
           This driver implement the ACPI Extensions For Display Adapters
           for integrated graphics devices on motherboard, as specified in
@@ -129,10 +119,9 @@ config ACPI_VIDEO
           for your integrated video device.
 
 config ACPI_HOTKEY
-        tristate "Generic Hotkey"
-        depends on ACPI_INTERPRETER
+        tristate "Generic Hotkey (EXPERIMENTAL)"
         depends on EXPERIMENTAL
-        depends on !IA64_SGI_SN
+        depends on X86
         default n
         help
           Experimental consolidated hotkey driver.
@@ -140,31 +129,30 @@ config ACPI_HOTKEY
 
 config ACPI_FAN
         tristate "Fan"
-        default m
+        default y
         help
           This driver adds support for ACPI fan devices, allowing user-mode 
           applications to perform basic fan control (on, off, status).
 
 config ACPI_PROCESSOR
         tristate "Processor"
-        default m
+        default y
         help
           This driver installs ACPI as the idle handler for Linux, and uses
           ACPI C2 and C3 processor states to save power, on systems that
-          support it.
+          support it.  It is required by several flavors of cpufreq
+          Performance-state drivers.
 
 config ACPI_HOTPLUG_CPU
-        bool "Processor Hotplug (EXPERIMENTAL)"
-        depends on ACPI_PROCESSOR && HOTPLUG_CPU && EXPERIMENTAL
+        bool
+        depends on ACPI_PROCESSOR && HOTPLUG_CPU
         select ACPI_CONTAINER
-        default n
-         ---help---
-         Select this option if your platform support physical CPU hotplug.
+        default y
 
 config ACPI_THERMAL
         tristate "Thermal Zone"
         depends on ACPI_PROCESSOR
-        default m
+        default y
         help
           This driver adds support for ACPI thermal zones.  Most mobile and
           some desktop systems support ACPI thermal zones.  It is HIGHLY
@@ -180,7 +168,7 @@ config ACPI_NUMA
 config ACPI_ASUS
         tristate "ASUS/Medion Laptop Extras"
         depends on X86
-        default m
+        default y
         ---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
@@ -209,7 +197,7 @@ config ACPI_ASUS
 config ACPI_IBM
         tristate "IBM ThinkPad Laptop Extras"
         depends on X86
-        default m
+        default y
         ---help---
           This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
           support for Fn-Fx key combinations, Bluetooth control, video
@@ -222,7 +210,7 @@ config ACPI_IBM
 config ACPI_TOSHIBA
         tristate "Toshiba Laptop Extras"
         depends on X86
-        default m
+        default y
         ---help---
           This driver adds support for access to certain system settings
           on "legacy free" Toshiba laptops.  These laptops can be recognized by
@@ -263,7 +251,7 @@ config ACPI_CUSTOM_DSDT_FILE
 
 config ACPI_BLACKLIST_YEAR
         int "Disable ACPI for systems before Jan 1st this year"
-        depends on ACPI_INTERPRETER
+        depends on X86
         default 0
         help
           enter a 4-digit year, eg. 2001 to disable ACPI by default
@@ -281,10 +269,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
@@ -298,10 +282,6 @@ config ACPI_POWER
         bool
         default y
 
-config ACPI_PCI
-        bool
-        default PCI
-
 config ACPI_SYSTEM
         bool
         default y
@@ -309,14 +289,11 @@ 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 !X86_64
-        default n
+        default y
         help
           The Power Management Timer is available on all ACPI-capable,
           in most cases even if ACPI is unusable or blacklisted.