Route the Joojoo tablet to the hid-egalax driverv1.0.3

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

10 files changed, 16 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 4d866f6..1232b38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME    = hid
-VERSION = 1.0.2
+VERSION = 1.0.3
 SRC     = usr/src
 DKMSSRC = $(SRC)/dkms_source_tree
 
diff --git a/debian/changelog b/debian/changelog
index 4a47856..74a63f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hid-dkms (1.0.3) maverick; urgency=low
+
+  * Route the Joojoo tablet to the special driver
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Wed, 22 Sep 2010 13:15:18 +0200
+
 hid-dkms (1.0.2) maverick; urgency=low
 
   * Package numbering fix
diff --git a/debian/postinst b/debian/postinst
index 7187ba7..1b19ae9 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -3,7 +3,7 @@
 set -e
 
 NAME=hid
-VERSION=1.0.2
+VERSION=1.0.3
 
 case "$1" in
     configure)
diff --git a/debian/postrm b/debian/postrm
index 82c13ad..34bff8e 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=hid
-VERSION=1.0.2
+VERSION=1.0.3
 
 set -e
 
diff --git a/debian/prerm b/debian/prerm
index 68a1680..2907011 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=hid
-VERSION=1.0.2
+VERSION=1.0.3
 
 set -e
 
diff --git a/debian/rules b/debian/rules
index cb7f58c..b79fe77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 NAME=hid
-VERSION=1.0.2
+VERSION=1.0.3
 
 configure: configure-stamp
 configure-stamp:
diff --git a/usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION b/usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION
index 2c689b1..ed7ecc1 100644
--- a/usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION
+++ b/usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION
@@ -1 +1 @@
-2.6.35-19-generic
+2.6.35-22-generic
diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 03f8c02..3976ff7 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
 NAME=hid
-VERSION=1.0.2
+VERSION=1.0.3
 PACKAGE_NAME="$NAME"
 PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}
diff --git a/usr/src/dkms_source_tree/hid-core.c b/usr/src/dkms_source_tree/hid-core.c
index 79fc152..535a438 100644
--- a/usr/src/dkms_source_tree/hid-core.c
+++ b/usr/src/dkms_source_tree/hid-core.c
@@ -1295,6 +1295,7 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },
         { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
diff --git a/usr/src/dkms_source_tree/hid-ids.h b/usr/src/dkms_source_tree/hid-ids.h
index 631d902..35c873e 100644
--- a/usr/src/dkms_source_tree/hid-ids.h
+++ b/usr/src/dkms_source_tree/hid-ids.h
@@ -187,6 +187,8 @@
 #define USB_VENDOR_ID_DWAV              0x0eef
 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER    0x0001
 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH    0x480d
+#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1   0x720c
+
 
 #define USB_VENDOR_ID_ELO               0x04E7
 #define USB_DEVICE_ID_ELO_TS2700        0x0020