diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 20:14:34 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 20:14:34 (GMT) |
commit | f7a0fd56e4f58aec3300082fc10433052e2f1863 (patch) | |
tree | 4b3348f4866f6b3417f456a298229d63d4581424 /drivers/hid/Kconfig | |
parent | 5e1e704a7de14ae79dc4d983dbbcab67064960c9 (diff) | |
parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
download | linux-f7a0fd56e4f58aec3300082fc10433052e2f1863.tar.xz |
Merge 3.12-rc6 into staging-next.
We want these fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 71b70e3..c91d547 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -241,6 +241,7 @@ config HID_HOLTEK - Sharkoon Drakonia / Perixx MX-2000 gaming mice - Tracer Sniper TRM-503 / NOVA Gaming Slider X200 / Zalman ZM-GM1 + - SHARKOON DarkGlider Gaming mouse config HOLTEK_FF bool "Holtek On Line Grip force feedback support" |