diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-05 21:20:24 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-05 21:20:24 +0200 |
| commit | 92944c1c943647c7eb39c081feeecdd169f68ee4 (patch) | |
| tree | 1412deee46f6be19cf9b5a65a8d76ed4553866a8 /drivers/input/touchscreen/Kconfig | |
| parent | Input: add support for PowerOn button on the AB8500 MFD (diff) | |
| parent | Input: mrst-touchscreen - move out of staging (diff) | |
| download | linux-92944c1c943647c7eb39c081feeecdd169f68ee4.tar.xz linux-92944c1c943647c7eb39c081feeecdd169f68ee4.zip | |
Merge branch 'mrst-touchscreen' into next
Conflicts:
drivers/input/touchscreen/Makefile
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 400c99de0bb3..d59feb7b90f6 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -260,6 +260,18 @@ config TOUCHSCREEN_INEXIO To compile this driver as a module, choose M here: the module will be called inexio. +config TOUCHSCREEN_INTEL_MID + tristate "Intel MID platform resistive touchscreen" + depends on INTEL_SCU_IPC + help + Say Y here if you have a Intel MID based touchscreen in + your system. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called intel_mid_touch. + config TOUCHSCREEN_MK712 tristate "ICS MicroClock MK712 touchscreen" help |