diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-20 06:05:39 (GMT) |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-20 06:05:39 (GMT) |
commit | 2d9f0d964be94fd51c7303288c6f9c88bf2381fe (patch) | |
tree | 2631c3e82abc145a6e9c8e2c18687833c71de012 /drivers/input/mouse/Kconfig | |
parent | 9937c026820baabd1e908a9c1e6bdc846293000a (diff) | |
parent | 005a69d632cd8694061c2dd27492fe874780b5ee (diff) | |
download | linux-fsl-qoriq-2d9f0d964be94fd51c7303288c6f9c88bf2381fe.tar.xz |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.9 merge window.
Diffstat (limited to 'drivers/input/mouse/Kconfig')
-rw-r--r-- | drivers/input/mouse/Kconfig | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index cd6268c..802bd6a 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -68,6 +68,16 @@ config MOUSE_PS2_SYNAPTICS If unsure, say Y. +config MOUSE_PS2_CYPRESS + bool "Cypress PS/2 mouse protocol extension" if EXPERT + default y + depends on MOUSE_PS2 + help + Say Y here if you have a Cypress PS/2 Trackpad connected to + your system. + + If unsure, say Y. + config MOUSE_PS2_LIFEBOOK bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EXPERT default y @@ -193,6 +203,18 @@ config MOUSE_BCM5974 To compile this driver as a module, choose M here: the module will be called bcm5974. +config MOUSE_CYAPA + tristate "Cypress APA I2C Trackpad support" + depends on I2C + help + This driver adds support for Cypress All Points Addressable (APA) + I2C Trackpads, including the ones used in 2012 Samsung Chromebooks. + + Say Y here if you have a Cypress APA I2C Trackpad. + + To compile this driver as a module, choose M here: the module will be + called cyapa. + config MOUSE_INPORT tristate "InPort/MS/ATIXL busmouse" depends on ISA |