diff options
author | Dmitry Torokhov | 2013-10-08 17:43:00 +0200 |
---|---|---|
committer | Dmitry Torokhov | 2013-10-08 17:43:00 +0200 |
commit | e3c55d406bd8df1a878546002c93db90c42be10c (patch) | |
tree | efb0ba2707c95fd7166cf1b76887c43c977e37dd /drivers/input/serio/Kconfig | |
parent | Input: st1232 - include linux/of.h header (diff) | |
parent | Linux 3.12-rc4 (diff) | |
download | kernel-qcow2-linux-e3c55d406bd8df1a878546002c93db90c42be10c.tar.gz kernel-qcow2-linux-e3c55d406bd8df1a878546002c93db90c42be10c.tar.xz kernel-qcow2-linux-e3c55d406bd8df1a878546002c93db90c42be10c.zip |
Merge tag 'v3.12-rc4' into next
Merge with mainline to bring in changes to input subsystem that were
committed through other trees.
Diffstat (limited to 'drivers/input/serio/Kconfig')
-rw-r--r-- | drivers/input/serio/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index a5f342e7ea91..296cb88d7008 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -239,7 +239,6 @@ config SERIO_PS2MULT config SERIO_ARC_PS2 tristate "ARC PS/2 support" - depends on GENERIC_HARDIRQS help Say Y here if you have an ARC FPGA platform with a PS/2 controller in it. |