diff options
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/dkms_source_tree/KERNEL_SOURCE_VERSION | 2 | ||||
| -rw-r--r-- | usr/src/dkms_source_tree/dkms.conf | 2 | ||||
| -rw-r--r-- | usr/src/dkms_source_tree/hid-core.c | 1 | ||||
| -rw-r--r-- | usr/src/dkms_source_tree/hid-ids.h | 2 |
4 files changed, 5 insertions, 2 deletions
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 @@ | |||
| 1 | NAME=hid | 1 | NAME=hid |
| 2 | VERSION=1.0.2 | 2 | VERSION=1.0.3 |
| 3 | PACKAGE_NAME="$NAME" | 3 | PACKAGE_NAME="$NAME" |
| 4 | PACKAGE_VERSION="$VERSION" | 4 | PACKAGE_VERSION="$VERSION" |
| 5 | MAKE[0]="make -C ${kernel_source_dir} | 5 | 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[] = { | |||
| 1295 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) }, | 1295 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) }, |
| 1296 | { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) }, | 1296 | { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) }, |
| 1297 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) }, | 1297 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) }, |
| 1298 | { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) }, | ||
| 1298 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, | 1299 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, |
| 1299 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) }, | 1300 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) }, |
| 1300 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) }, | 1301 | { 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 @@ | |||
| 187 | #define USB_VENDOR_ID_DWAV 0x0eef | 187 | #define USB_VENDOR_ID_DWAV 0x0eef |
| 188 | #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 | 188 | #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 |
| 189 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d | 189 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d |
| 190 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c | ||
| 191 | |||
| 190 | 192 | ||
| 191 | #define USB_VENDOR_ID_ELO 0x04E7 | 193 | #define USB_VENDOR_ID_ELO 0x04E7 |
| 192 | #define USB_DEVICE_ID_ELO_TS2700 0x0020 | 194 | #define USB_DEVICE_ID_ELO_TS2700 0x0020 |
