Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c964badc4b5026b60988a20083f400ea602b0a98..be8378c45813c4d9632477a80a3cf3f06aa23298 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -301,6 +301,15 @@ config KEYBOARD_PXA27x
          To compile this driver as a module, choose M here: the
          module will be called pxa27x_keypad.
 
+config KEYBOARD_PXA930_ROTARY
+       tristate "PXA930/PXA935 Enhanced Rotary Controller Support"
+       depends on CPU_PXA930 || CPU_PXA935
+       help
+         Enable support for PXA930/PXA935 Enhanced Rotary Controller.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pxa930_rotary.
+
 config KEYBOARD_AAED2000
        tristate "AAED-2000 keyboard"
        depends on MACH_AAED2000