diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 00:37:30 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 00:37:30 -0800 |
| commit | d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8 (patch) | |
| tree | 56e92b487de80090a998ff3c0469375982156802 /drivers/input/serio/Kconfig | |
| parent | Revert "Input: synaptics_rmi4 - use devm_device_add_group() for attributes in F01" (diff) | |
| parent | Input: goodix - use generic touchscreen_properties (diff) | |
| download | linux-dev-d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8.tar.xz linux-dev-d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.16 merge window.
Diffstat (limited to 'drivers/input/serio/Kconfig')
| -rw-r--r-- | drivers/input/serio/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 21488c048fa3..ca4530eb3378 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -96,16 +96,6 @@ config SERIO_RPCKBD To compile this driver as a module, choose M here: the module will be called rpckbd. -config SERIO_AT32PSIF - tristate "AVR32 PSIF PS/2 keyboard and mouse controller" - depends on AVR32 - help - Say Y here if you want to use the PSIF peripheral on AVR32 devices - and connect a PS/2 keyboard and/or mouse to it. - - To compile this driver as a module, choose M here: the module will - be called at32psif. - config SERIO_AMBAKMI tristate "AMBA KMI keyboard controller" depends on ARM_AMBA |