HID: merge hid-egalax into hid-multitouch
authorRichard Nauber <richard.nauber@googlemail.com>
Wed, 9 Mar 2011 05:20:57 +0000 (06:20 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 14 Mar 2011 12:05:08 +0000 (13:05 +0100)
commit4875ac114d8bce99838a9b0ee7c3f5469cc6352e
tree5829b1fd88aa5402366cb1ea1374189d14f7dd24
parentf153fc3990d4ad2709a52d7150e2c04363afb1fb
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>
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-egalax.c [deleted file]
drivers/hid/hid-multitouch.c
This page took 0.027074 seconds and 5 git commands to generate.