Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

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

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 297a48f..d5bc288 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -140,6 +140,7 @@ config ACER_WMI
        depends on EXPERIMENTAL
        depends on ACPI
        depends on LEDS_CLASS
+       depends on NEW_LEDS
        depends on BACKLIGHT_CLASS_DEVICE
        depends on SERIO_I8042
        select ACPI_WMI
@@ -160,6 +161,7 @@ config ASUS_LAPTOP
         depends on ACPI
        depends on EXPERIMENTAL && !ACPI_ASUS
        depends on LEDS_CLASS
+       depends on NEW_LEDS
        depends on BACKLIGHT_CLASS_DEVICE
         ---help---
          This is the new Linux driver for Asus laptops. It may also support some
@@ -177,17 +179,29 @@ config FUJITSU_LAPTOP
         tristate "Fujitsu Laptop Extras"
         depends on X86
         depends on ACPI
+       depends on INPUT
         depends on BACKLIGHT_CLASS_DEVICE
         ---help---
          This is a driver for laptops built by Fujitsu:
 
            * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks
            * Possibly other Fujitsu laptop models
+           * Tested with S6410 and S7020
 
-         It adds support for LCD brightness control.
+         It adds support for LCD brightness control and some hotkeys.
 
          If you have a Fujitsu laptop, say Y or M here.
 
+config FUJITSU_LAPTOP_DEBUG
+       bool "Verbose debug mode for Fujitsu Laptop Extras"
+       depends on FUJITSU_LAPTOP
+       default n
+       ---help---
+         Enables extra debug output from the fujitsu extras driver, at the
+         expense of a slight increase in driver size.
+
+         If you are not sure, say N here.
+
 config TC1100_WMI
        tristate "HP Compaq TC1100 Tablet WMI Extras (EXPERIMENTAL)"
        depends on X86 && !X86_64
@@ -217,6 +231,23 @@ config MSI_LAPTOP
 
          If you have an MSI S270 laptop, say Y or M here.
 
+config COMPAL_LAPTOP
+       tristate "Compal Laptop Extras"
+       depends on X86
+       depends on ACPI_EC
+       depends on BACKLIGHT_CLASS_DEVICE
+       ---help---
+         This is a driver for laptops built by Compal:
+
+         Compal FL90/IFL90
+         Compal FL91/IFL91
+         Compal FL92/JFL92
+         Compal FT00/IFT00
+
+         It adds support for Bluetooth, WLAN and LCD brightness control.
+
+         If you have an Compal FL9x/IFL9x/FT00 laptop, say Y or M here.
+
 config SONY_LAPTOP
        tristate "Sony Laptop Extras"
        depends on X86 && ACPI
@@ -241,10 +272,15 @@ config SONYPI_COMPAT
 config THINKPAD_ACPI
        tristate "ThinkPad ACPI Laptop Extras"
        depends on X86 && ACPI
+       select BACKLIGHT_LCD_SUPPORT
        select BACKLIGHT_CLASS_DEVICE
        select HWMON
        select NVRAM
-       depends on INPUT
+       select INPUT
+       select NEW_LEDS
+       select LEDS_CLASS
+       select NET
+       select RFKILL
        ---help---
          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video
@@ -344,6 +380,7 @@ config ATMEL_SSC
 config INTEL_MENLOW
        tristate "Thermal Management driver for Intel menlow platform"
        depends on ACPI_THERMAL
+       select THERMAL
        depends on X86
        ---help---
          ACPI thermal management enhancement driver on
@@ -351,6 +388,19 @@ config INTEL_MENLOW
 
          If unsure, say N.
 
+config EEEPC_LAPTOP
+       tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
+       depends on X86
+       depends on ACPI
+       depends on BACKLIGHT_CLASS_DEVICE
+       depends on HWMON
+       depends on EXPERIMENTAL
+       ---help---
+         This driver supports the Fn-Fx keys on Eee PC laptops.
+         It also adds the ability to switch camera/wlan on/off.
+
+         If you have an Eee PC laptop, say Y or M here.
+
 config ENCLOSURE_SERVICES
        tristate "Enclosure Services"
        default n
@@ -372,4 +422,17 @@ config SGI_XP
          this feature will allow for direct communication between SSIs
          based on a network adapter and DMA messaging.
 
+config HP_ILO
+       tristate "Channel interface driver for HP iLO/iLO2 processor"
+       default n
+       help
+         The channel interface driver allows applications to communicate
+         with iLO/iLO2 management processors present on HP ProLiant
+         servers.  Upon loading, the driver creates /dev/hpilo/dXccbN files,
+         which can be used to gather data from the management processor,
+         via read and write system calls.
+
+         To compile this driver as a module, choose M here: the
+         module will be called hpilo.
+
 endif # MISC_DEVICES