Pull sony into release branch

[pandora-kernel.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 87e1db8..80b199f 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -42,7 +42,7 @@ config SGI_IOC4
 
 config TIFM_CORE
        tristate "TI Flash Media interface support (EXPERIMENTAL)"
 
 config TIFM_CORE
        tristate "TI Flash Media interface support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL
+       depends on EXPERIMENTAL && PCI

        help
          If you want support for Texas Instruments(R) Flash Media adapters
          you should select this option and then also choose an appropriate
        help
          If you want support for Texas Instruments(R) Flash Media adapters
          you should select this option and then also choose an appropriate


@@ -75,6 +75,7 @@ config ASUS_LAPTOP
         depends on ACPI
        depends on EXPERIMENTAL && !ACPI_ASUS
        depends on LEDS_CLASS
         depends on ACPI
        depends on EXPERIMENTAL && !ACPI_ASUS
        depends on LEDS_CLASS

+       depends on BACKLIGHT_CLASS_DEVICE

         ---help---
          This is the new Linux driver for Asus laptops. It may also support some
          MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
         ---help---
          This is the new Linux driver for Asus laptops. It may also support some
          MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate


@@ -106,4 +107,19 @@ config MSI_LAPTOP
 
          If you have an MSI S270 laptop, say Y or M here.
 
 
          If you have an MSI S270 laptop, say Y or M here.
 

+config SONY_LAPTOP
+       tristate "Sony Laptop Extras"
+       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.
+
+         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
+         devices.
+
+         Read <file:Documentation/sony-laptop.txt> for more information.
+

 endmenu
 endmenu