Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index aaaa61ea4217a5013da3933b768da1e99d261ed3..b5e67c0ff43304d3e16be35525a47e9fc96aaaaf 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -5,6 +5,11 @@
 menuconfig MISC_DEVICES
        bool "Misc devices"
        default y
+       ---help---
+         Say Y here to get to see options for device drivers from various
+         different categories. This option alone does not add any kernel code.
+
+         If you say N, all options in this submenu will be skipped and disabled.
 
 if MISC_DEVICES
 
@@ -106,6 +111,21 @@ config ASUS_LAPTOP
 
          If you have an ACPI-compatible ASUS laptop, say Y or M here.
 
+config FUJITSU_LAPTOP
+        tristate "Fujitsu Laptop Extras"
+        depends on X86
+        depends on ACPI
+        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
+
+         It adds support for LCD brightness control.
+
+         If you have a Fujitsu laptop, say Y or M here.
+
 config MSI_LAPTOP
         tristate "MSI Laptop Extras"
         depends on X86
@@ -129,6 +149,7 @@ config SONY_LAPTOP
        tristate "Sony Laptop Extras"
        depends on X86 && ACPI
        select BACKLIGHT_CLASS_DEVICE
+       depends on INPUT
          ---help---
          This mini-driver drives the SNC and SPIC devices present in the ACPI
          BIOS of the Sony Vaio laptops.
@@ -151,6 +172,7 @@ config THINKPAD_ACPI
        select BACKLIGHT_CLASS_DEVICE
        select HWMON
        select NVRAM
+       depends on INPUT
        ---help---
          This is a driver for the IBM and Lenovo ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video
@@ -158,7 +180,7 @@ config THINKPAD_ACPI
          For more information about this driver see 
          <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> .
 
-         This driver was formely known as ibm-acpi.
+         This driver was formerly known as ibm-acpi.
 
          If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
 
@@ -192,22 +214,22 @@ config THINKPAD_ACPI_BAY
        default y
        ---help---
          Allows the thinkpad_acpi driver to handle removable bays.  It will
-         eletrically disable the device in the bay, and also generate
+         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_INPUT_ENABLED
-       bool "Enable input layer support by default"
-       depends on THINKPAD_ACPI
-       default y
+
+config ATMEL_SSC
+       tristate "Device driver for Atmel SSC peripheral"
+       depends on AVR32 || ARCH_AT91
        ---help---
-         Enables hot key handling over the input layer by default.  If unset,
-         the driver does not enable any hot key handling by default, and also
-         starts up with a mostly empty keymap.
+         This option enables device driver support for Atmel Syncronized
+         Serial Communication peripheral (SSC).
 
-         If you are not sure, say Y here.  Say N to retain the deprecated
-         behavior of ibm-acpi, and thinkpad-acpi for kernels up to 2.6.21.
+         The SSC peripheral supports a wide variety of serial frame based
+         communications, i.e. I2S, SPI, etc.
 
+         If unsure, say N.
 
 endif # MISC_DEVICES