Merge branch 'misc-2.6.32' into release

[safe/jmp/linux-2.6] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0680655..55ca39d 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -52,9 +52,9 @@ config ACERHDF
          here.
 
 config ASUS_LAPTOP
-       tristate "Asus Laptop Extras (EXPERIMENTAL)"
+       tristate "Asus Laptop Extras"
        depends on ACPI
-       depends on EXPERIMENTAL && !ACPI_ASUS
+       depends on !ACPI_ASUS
        select LEDS_CLASS
        select NEW_LEDS
        select BACKLIGHT_CLASS_DEVICE
@@ -99,6 +99,7 @@ config FUJITSU_LAPTOP
        depends on ACPI
        depends on INPUT
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on LEDS_CLASS || LEDS_CLASS=n
        ---help---
          This is a driver for laptops built by Fujitsu:
 
@@ -277,31 +278,6 @@ config THINKPAD_ACPI_UNSAFE_LEDS
          Say N here, unless you are building a kernel for your own
          use, and need to control the important firmware LEDs.
 
-config THINKPAD_ACPI_DOCK
-       bool "Legacy Docking Station Support"
-       depends on THINKPAD_ACPI
-       depends on ACPI_DOCK=n
-       default n
-       ---help---
-         Allows the thinkpad_acpi driver to handle docking station events.
-         This support was made obsolete by the generic ACPI docking station
-         support (CONFIG_ACPI_DOCK).  It will allow locking and removing the
-         laptop from the docking station, but will not properly connect PCI
-         devices.
-
-         If you are not sure, say N here.
-
-config THINKPAD_ACPI_BAY
-       bool "Legacy Removable Bay Support"
-       depends on THINKPAD_ACPI
-       default y
-       ---help---
-         Allows the thinkpad_acpi driver to handle removable bays.  It will
-         electrically disable the device in the bay, and also generate
-         notifications when the bay lever is ejected or inserted.
-
-         If you are not sure, say Y here.
-
 config THINKPAD_ACPI_VIDEO
        bool "Video output control support"
        depends on THINKPAD_ACPI
@@ -355,6 +331,7 @@ config EEEPC_LAPTOP
        depends on INPUT
        depends on EXPERIMENTAL
        depends on RFKILL || RFKILL = n
+       depends on HOTPLUG_PCI
        select BACKLIGHT_CLASS_DEVICE
        select HWMON
        ---help---
@@ -389,7 +366,7 @@ config ACPI_WMI
          any ACPI-WMI devices.
 
 config ACPI_ASUS
-       tristate "ASUS/Medion Laptop Extras"
+       tristate "ASUS/Medion Laptop Extras (DEPRECATED)"
        depends on ACPI
        select BACKLIGHT_CLASS_DEVICE
        ---help---
@@ -420,6 +397,15 @@ config ACPI_ASUS
          NOTE: This driver is deprecated and will probably be removed soon,
          use asus-laptop instead.
 
+config TOPSTAR_LAPTOP
+       tristate "Topstar Laptop Extras"
+       depends on ACPI
+       depends on INPUT
+       ---help---
+         This driver adds support for hotkeys found on Topstar laptops.
+
+         If you have a Topstar laptop, say Y or M here.
+
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on ACPI