diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-03 23:56:31 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-03 23:56:31 -0700 |
| commit | a5cba18c4de288335a975b5d57b68f6787330985 (patch) | |
| tree | 9d1e46eb1e53807f9d76a1ee25a5cd7a15ae00f5 /drivers/input/serio | |
| parent | f7ebc4dcdeb1be7209d94a8c0dc602ab24e36ae1 (diff) | |
| parent | d55d0b56b9c3a0d94ca6cc1643063610c138dde9 (diff) | |
| download | linux-a5cba18c4de288335a975b5d57b68f6787330985.tar.gz linux-a5cba18c4de288335a975b5d57b68f6787330985.tar.bz2 linux-a5cba18c4de288335a975b5d57b68f6787330985.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.2 merge window.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 77833d7a004b..200841b77edb 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -244,6 +244,7 @@ config SERIO_PS2MULT config SERIO_ARC_PS2 tristate "ARC PS/2 support" + depends on HAS_IOMEM help Say Y here if you have an ARC FPGA platform with a PS/2 controller in it. |