diff options
| author | Richard Nauber <richard.nauber@googlemail.com> | 2011-03-09 08:20:57 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-03-14 15:05:08 +0300 |
| commit | 4875ac114d8bce99838a9b0ee7c3f5469cc6352e (patch) | |
| tree | 5829b1fd88aa5402366cb1ea1374189d14f7dd24 /drivers/hid/Makefile | |
| parent | f153fc3990d4ad2709a52d7150e2c04363afb1fb (diff) | |
| download | linux-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/Makefile')
| -rw-r--r-- | drivers/hid/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 6efc2a0370ad..29e98985b901 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -36,7 +36,6 @@ obj-$(CONFIG_HID_CHICONY) += hid-chicony.o obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o -obj-$(CONFIG_HID_EGALAX) += hid-egalax.o obj-$(CONFIG_HID_ELECOM) += hid-elecom.o obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o obj-$(CONFIG_HID_GYRATION) += hid-gyration.o |