Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 0b92b2f6ea68d1b46aac012d0ec7efd1b599e36a..b1b2696c9c2bba0c2f5d340d9ef4f98c9daf0f81 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -18,8 +18,8 @@ config ATMEL_PWM
        depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
        help
          This option enables device driver support for the PWM channels
-         on certain Atmel prcoessors.  Pulse Width Modulation is used for
-         purposes including software controlled power-efficent backlights
+         on certain Atmel processors.  Pulse Width Modulation is used for
+         purposes including software controlled power-efficient backlights
          on LCD displays, motor control, and waveform generation.
 
 config ATMEL_TCLIB
@@ -142,7 +142,7 @@ 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
+         This option enables device driver support for Atmel Synchronized
          Serial Communication peripheral (SSC).
 
          The SSC peripheral supports a wide variety of serial frame based
@@ -150,6 +150,20 @@ config ATMEL_SSC
 
          If unsure, say N.
 
+config OMAP_STI
+       bool "Serial Trace Interface support"
+       depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX
+       default n
+       help
+         Serial Trace Interface. The protocols suported for OMAP1/2/3 are
+         STI/CSTI/XTIv2 correspondingly.
+
+config OMAP_STI_CONSOLE
+       bool "STI console support"
+       depends on OMAP_STI
+       help
+         This enables a console driver by way of STI/XTI.
+
 config ENCLOSURE_SERVICES
        tristate "Enclosure Services"
        default n