diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:35:05 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:35:05 -0700 |
commit | 2ebf599a80b21d0619472236130880cfca327119 (patch) | |
tree | 467bee6c436acf1043119b23e20b18445795da79 /drivers/input/touchscreen/Kconfig | |
parent | 0eebd0b045652711b1a9bc33ad7ec5017d51b253 (diff) | |
parent | b8103121bd5a647c2b23616a9026f009b825690c (diff) |
Merge branch '3rdparty/synaptics' into after-3rdparty
Conflicts:
arch/arm/mach-tegra/Makefile
drivers/input/touchscreen/Kconfig
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 57da586b393d..55b8d8349627 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -914,4 +914,16 @@ config TOUCHSCREEN_RM31080A To compile this driver as a module, choose M here: the module will be called RAYDIUM_31080A. +config TOUCHSCREEN_SYN_RMI4_SPI + tristate "RMI4 SPI Support" + depends on SPI_MASTER + help + Say Y here if you want to support RMI4 devices connect + to an SPI bus. + + If unsure, say Y. + + To compile this driver as a module, choose M here: the + module will be called rmi-spi. + endif |