summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 15:19:22 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 15:19:22 +0200
commitf13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch)
tree44419bd03c33e662302dd003f57d36e133144f91 /drivers/input/keyboard/Kconfig
parentMerge branch 'l7200' into devel (diff)
parentARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128 (diff)
downloadlinux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.tar.xz
linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.zip
Merge branch 'shmobile' into devel
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
-rw-r--r--drivers/input/keyboard/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 3525f533e186..1ba25145b333 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -124,7 +124,7 @@ config KEYBOARD_ATKBD_RDI_KEYCODES
right-hand column will be interpreted as the key shown in the
left-hand column.
-config QT2160
+config KEYBOARD_QT2160
tristate "Atmel AT42QT2160 Touch Sensor Chip"
depends on I2C && EXPERIMENTAL
help