summaryrefslogtreecommitdiff
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorRichard Nauber <richard.nauber@googlemail.com>2011-03-09 08:20:57 +0300
committerJiri Kosina <jkosina@suse.cz>2011-03-14 15:05:08 +0300
commit4875ac114d8bce99838a9b0ee7c3f5469cc6352e (patch)
tree5829b1fd88aa5402366cb1ea1374189d14f7dd24 /drivers/hid/Kconfig
parentf153fc3990d4ad2709a52d7150e2c04363afb1fb (diff)
downloadlinux-4875ac114d8bce99838a9b0ee7c3f5469cc6352e.tar.xz
HID: merge hid-egalax into hid-multitouch
This patch merges the hid-egalax driver into hid-multitouch. There are two types of devices support by the hid-egalax driver: resistive and capacitive. Here, they are implicitly distinguished by the absence of a HID_DG_CONTACTCOUNT field in the latter, so no special code path needs to be introduced. As a side effect, this patch fixes the broken suspend/resume behavior in the old driver. [rydberg@euromail.se: minor fixups] Signed-off-by: Richard Nauber <Richard.Nauber@gmail.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r--drivers/hid/Kconfig9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a0b117ddeef5..b4b8b21d437d 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -160,13 +160,6 @@ config HID_EMS_FF
Currently the following devices are known to be supported:
- Trio Linker Plus II
-config HID_EGALAX
- tristate "eGalax multi-touch panel"
- depends on USB_HID
- ---help---
- Support for the eGalax dual-touch panels, including the
- Joojoo and Wetab tablets.
-
config HID_ELECOM
tristate "ELECOM BM084 bluetooth mouse"
depends on BT_HIDP
@@ -307,6 +300,8 @@ config HID_MULTITOUCH
- IrTouch Infrared USB panels
- Pixcir dual touch panels
- 'Sensing Win7-TwoFinger' panel by GeneralTouch
+ - eGalax dual-touch panels, including the
+ Joojoo and Wetab tablets
If unsure, say N.