Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index e0a1ff927a5bc45057e5e5cd0bab7ae0f7704e08..b5e67c0ff43304d3e16be35525a47e9fc96aaaaf 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -180,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.
 
@@ -214,10 +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 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).
+
+         The SSC peripheral supports a wide variety of serial frame based
+         communications, i.e. I2S, SPI, etc.
+
+         If unsure, say N.
+
 endif # MISC_DEVICES