Pull documentation into release branch

[~andy/linux] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index df89367032c3d62bcedb0ade1141d9954c638c8d..b5e67c0ff43304d3e16be35525a47e9fc96aaaaf 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -149,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.
@@ -171,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
@@ -178,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.
 
@@ -212,30 +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 n
-       ---help---
-         This option enables thinkpad-acpi hot key handling over the input
-         layer at driver load time.  When it is unset, the driver does not
-         enable hot key handling by default, and also starts up with a mostly
-         empty keymap.
 
-         This option should be enabled if you have a new enough HAL or other
-         userspace support that properly handles the thinkpad-acpi event
-         device.  It auto-tunes the hot key support to those reported by the
-         firmware and enables it automatically.
+config ATMEL_SSC
+       tristate "Device driver for Atmel SSC peripheral"
+       depends on AVR32 || ARCH_AT91
+       ---help---
+         This option enables device driver support for Atmel Syncronized
+         Serial Communication peripheral (SSC).
 
-         If unsure, say N here to retain the old behaviour of ibm-acpi, and
-         thinkpad-acpi up to kernel 2.6.21: userspace will have to enable and
-         set up the thinkpad-acpi hot key handling using the sysfs interace
-         after loading the driver.
+         The SSC peripheral supports a wide variety of serial frame based
+         communications, i.e. I2S, SPI, etc.
 
+         If unsure, say N.
 
 endif # MISC_DEVICES