OSDN Git Service

HID: merge hid-egalax into hid-multitouch
authorRichard Nauber <richard.nauber@googlemail.com>
Wed, 9 Mar 2011 05:20:57 +0000 (06:20 +0100)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 6 Apr 2011 03:11:51 +0000 (11:11 +0800)
commit8efb06636a2a61cee684dd94165496efbd87f72f
tree45501c2beb2cdada935d5c8db2eed8c5c642199a
parentd52ccd5c51f9051959a293ac4a91632ab9c1d8ef
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-multitouch.c