aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2010-04-21 09:52:00 -0400
committerJiri Kosina <jkosina@suse.cz>2010-04-21 10:22:03 -0400
commited9eac5b493c679ef5fc52273758fe334de82714 (patch)
tree55475a8581e6eb020b93954d88ef1a63093a57d2 /drivers/hid
parent18392212932ecbdc71bc6a298ad301328eefb09d (diff)
HID: add support for the Wacom Intuos 4 wireless
Same command set as the Graphire Bluetooth tablet. Signed-off-by: Bastien Nocera <hadess@hadess.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-ids.h1
-rw-r--r--drivers/hid/hid-wacom.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e1b4ce4eeb6e..0786bbdafb4a 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -456,6 +456,7 @@
456 456
457#define USB_VENDOR_ID_WACOM 0x056a 457#define USB_VENDOR_ID_WACOM 0x056a
458#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81 458#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81
459#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH 0xbd
459 460
460#define USB_VENDOR_ID_WISEGROUP 0x0925 461#define USB_VENDOR_ID_WISEGROUP 0x0925
461#define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005 462#define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 97ef6260fda0..51d7d77eb43b 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -435,7 +435,7 @@ static void wacom_remove(struct hid_device *hdev)
435 435
436static const struct hid_device_id wacom_devices[] = { 436static const struct hid_device_id wacom_devices[] = {
437 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) }, 437 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
438 438 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
439 { } 439 { }
440}; 440};
441MODULE_DEVICE_TABLE(hid, wacom_devices); 441MODULE_DEVICE_TABLE(hid, wacom_devices);