[kernel/f15] Support Wacom touchscreen 00e6 in Thinkpad x220 (rhbz#708307)

[Chuck Ebbert]

commit b67156cd9e4d538c6347c3ab82622e0e9e51a485
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Sat Jun 25 02:19:38 2011 -0400

    Support Wacom touchscreen 00e6 in Thinkpad x220 (rhbz#708307)

 ...com-add-support-for-lenovo-tablet-id-0xe6.patch |   36 ++++++++++++++++++++
 kernel.spec                                        |    8 +++--
 2 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/input-wacom-add-support-for-lenovo-tablet-id-0xe6.patch b/input-wacom-add-support-for-lenovo-tablet-id-0xe6.patch
new file mode 100644
index 0000000..f95908e
--- /dev/null
+++ b/input-wacom-add-support-for-lenovo-tablet-id-0xe6.patch
@@ -0,0 +1,36 @@
+From: Manoj Iyer <manoj.iyer at canonical.com>
+Date: Fri, 1 Apr 2011 05:39:43 +0000 (-0700)
+Subject: Input: wacom - add support for Lenovo tablet ID (0xE6)
+X-Git-Tag: v2.6.39-rc2~4^2~1
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=26fcd2a7618db6c16be6aa3e56c0f3c25381e5a3
+
+Input: wacom - add support for Lenovo tablet ID (0xE6)
+[ 2.6.38 backport ]
+
+Signed-off-by: Manoj Iyer <manoj.iyer at canonical.com>
+Acked-by: Ping Cheng <pingc at wacom.com>
+Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
+---
+RHBZ 708307
+
+diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
+index c87d94f..08ba5ad 100644
+--- a/drivers/input/tablet/wacom_wac.c
++++ b/drivers/input/tablet/wacom_wac.c
+@@ -1439,6 +1439,8 @@ static const struct wacom_features wacom_features_0xE2 =
+ 	{ "Wacom ISDv4 E2",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
+ static const struct wacom_features wacom_features_0xE3 =
+ 	{ "Wacom ISDv4 E3",       WACOM_PKGLEN_TPC2FG,    26202, 16325,  255,  0, TABLETPC2FG };
++static const struct wacom_features wacom_features_0xE6 =
++	{ "Wacom ISDv4 E6",       WACOM_PKGLEN_TPC2FG,    27760, 15694,  255,  0, TABLETPC2FG };
+ static const struct wacom_features wacom_features_0x47 =
+ 	{ "Wacom Intuos2 6x8",    WACOM_PKGLEN_INTUOS,    20320, 16240, 1023, 31, INTUOS };
+ static struct wacom_features wacom_features_0xD0 =
+@@ -1561,6 +1564,7 @@ const struct usb_device_id wacom_ids[] = {
+ 	{ USB_DEVICE_WACOM(0x9F) },
+ 	{ USB_DEVICE_WACOM(0xE2) },
+ 	{ USB_DEVICE_WACOM(0xE3) },
++	{ USB_DEVICE_WACOM(0xE6) },
+ 	{ USB_DEVICE_WACOM(0x47) },
+ 	{ USB_DEVICE_LENOVO(0x6004) },
+ 	{ }
diff --git a/kernel.spec b/kernel.spec
index 0339b76..ceaf9fe 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -651,6 +651,7 @@ Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch452: linux-2.6.30-no-pcspkr-modalias.patch
 # revert 2.6.38.8 patch that broke magicmouse
 Patch453: hid-magicmouse-ignore-ivalid-report-id-while-switching.patch
+Patch454: input-wacom-add-support-for-lenovo-tablet-id-0xe6.patch
 
 Patch460: linux-2.6-serial-460800.patch
 
@@ -1320,6 +1321,9 @@ ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
 # Revert 2.6.38.8 patch that broke magicmouse
 ApplyPatch hid-magicmouse-ignore-ivalid-report-id-while-switching.patch -R
+ApplyPatch input-wacom-add-support-for-lenovo-tablet-id-0xe6.patch
+ApplyPatch hid-ntrig-deref-unclaimed-input.patch
+ApplyPatch hid-multitouch-add-support-for-elo-touchsystems.patch
 
 # stop floppy.ko from autoloading during udev...
 ApplyPatch die-floppy-die.patch
@@ -1426,9 +1430,6 @@ ApplyPatch bonding-incorrect-tx-queue-offset.patch
 
 ApplyPatch scsi_dh_hp_sw-fix-deadlock-in-start_stop_endio.patch
 
-ApplyPatch hid-ntrig-deref-unclaimed-input.patch
-
-ApplyPatch hid-multitouch-add-support-for-elo-touchsystems.patch
 ApplyPatch bluetooth-device-ids-for-ath3k-on-pegatron-lucid-tablets.patch
 
 # rhbz#709122
@@ -2057,6 +2058,7 @@ fi
 - Revert 2.6.38.8 patch that broke magicmouse (rhbz#714381)
 - Fix drive detection failure on mvsas (rhbz#705019)
 - Fix oopses in the CFQ disk scheduler (rhbz#577968)
+- Support Wacom touchscreen 00e6 in Thinkpad x220 (rhbz#708307)
 
 * Thu Jun 23 2011 Dave Airlie <airlied at redhat.com> 2.6.38.8-34
 - drm-i915-snb-irq-stalls-fix.patch: fix Sandybridge IRQ stalls