From: Richard Nauber <richard.nauber@googlemail.com>
Date: Wed, 9 Mar 2011 05:20:57 +0000 (+0100)
Subject: HID: merge hid-egalax into hid-multitouch
X-Git-Tag: v2.6.39-rc1~429^2^3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4875ac114d8bce99838a9b0ee7c3f5469cc6352e;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed