Merge branch 'linux-2.6'

[powerpc.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 44e4c8f..a3c525b 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -112,20 +112,26 @@ config SONY_LAPTOP
        depends on X86 && ACPI
        select BACKLIGHT_CLASS_DEVICE
          ---help---
-         This mini-driver drives the SNC device present in the ACPI BIOS of
-         the Sony Vaio laptops.
+         This mini-driver drives the SNC and SPIC devices present in the ACPI
+         BIOS of the Sony Vaio laptops.
 
-         It gives access to some extra laptop functionalities. In its current
-         form, this driver let the user set or query the screen brightness
-         through the backlight subsystem and remove/apply power to some
+         It gives access to some extra laptop functionalities like Bluetooth,
+         screen brightness control, Fn keys and allows powering on/off some
          devices.
 
          Read <file:Documentation/sony-laptop.txt> for more information.
 
+config SONY_LAPTOP_OLD
+       bool "Sonypi compatibility"
+       depends on SONY_LAPTOP
+         ---help---
+         Build the sonypi driver compatibility code into the sony-laptop driver.
+
 config THINKPAD_ACPI
        tristate "ThinkPad ACPI Laptop Extras"
        depends on X86 && ACPI
        select BACKLIGHT_CLASS_DEVICE
+       select HWMON
        ---help---
          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video