diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:20 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:20 +0200 |
| commit | a85bf5e5e017318917640e8093fa4e9849577951 (patch) | |
| tree | dc8ff8395a534bedaa4125869775d910149b4dc1 /drivers/input/keyboard/Kconfig | |
| parent | 36cee0c070a631eb744aff33916dba0d8c92d3d6 (diff) | |
| parent | 248e54469c0f3513d0184c95c46cd6ce24582d64 (diff) | |
Merge topic branch 'input' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/input/keyboard/Kconfig')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index cdc385b2cf7..1cfd730f212 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -151,6 +151,16 @@ config KEYBOARD_BFIN To compile this driver as a module, choose M here: the module will be called bf54x-keys. +config KEYBOARD_DB5500 + tristate "DB5500 keyboard" + depends on UX500_SOC_DB5500 + help + Say Y here to enable the on-chip keypad controller on the + ST-Ericsson U5500 platform. + + To compile this driver as a module, choose M here: the + module will be called db5500_keypad. + config KEYBOARD_LKKBD tristate "DECstation/VAXstation LK201/LK401 keyboard" select SERIO @@ -381,7 +391,7 @@ config KEYBOARD_NEWTON To compile this driver as a module, choose M here: the module will be called newtonkbd. -config KEYBOARD_NOMADIK +config KEYBOARD_NOMADIK_SKE tristate "ST-Ericsson Nomadik SKE keyboard" depends on PLAT_NOMADIK help |