diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:18:05 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-20 13:18:05 +0100 |
| commit | 4a247a4119ee932e06e985e0a95a13c3eed4715b (patch) | |
| tree | 42b6a7c9edf2f40c7b645a493d63bdb67e5f7100 /drivers/hid/hid-wacom.c | |
| parent | 77aa8e65f0e20c294907a9fa8af92a3dbe0e0a51 (diff) | |
| parent | 4d5df5d11e8027c11c1079205757527cbaade62d (diff) | |
| download | op-kernel-dev-4a247a4119ee932e06e985e0a95a13c3eed4715b.zip op-kernel-dev-4a247a4119ee932e06e985e0a95a13c3eed4715b.tar.gz | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/Makefile
Diffstat (limited to 'drivers/hid/hid-wacom.c')
| -rw-r--r-- | drivers/hid/hid-wacom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index 694545d..067e296 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -590,6 +590,7 @@ static int wacom_probe(struct hid_device *hdev, wacom_poke(hdev, 1); break; case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH: + sprintf(hdev->name, "%s", "Wacom Intuos4 WL"); wdata->features = 0; wacom_set_features(hdev); break; |
