diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:32 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:32 -0400 |
| commit | e9e5f8e8d373e72f5c39dafde1ce110fc7082118 (patch) | |
| tree | 2991e33571a59cc2488daef36dcfeab7bddb9d7f /drivers/hid/hid-mosart.c | |
| parent | f899fc64cda8569d0529452aafc0da31c042df2e (diff) | |
| parent | db8c076b9206ea35b1f7299708d5510b17674db2 (diff) | |
Merge branch 'drm-intel-fixes' into HEAD
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.c
Diffstat (limited to 'drivers/hid/hid-mosart.c')
| -rw-r--r-- | drivers/hid/hid-mosart.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-mosart.c b/drivers/hid/hid-mosart.c index e91437c18906..ac5421d568f1 100644 --- a/drivers/hid/hid-mosart.c +++ b/drivers/hid/hid-mosart.c | |||
| @@ -239,6 +239,7 @@ static void mosart_remove(struct hid_device *hdev) | |||
| 239 | 239 | ||
| 240 | static const struct hid_device_id mosart_devices[] = { | 240 | static const struct hid_device_id mosart_devices[] = { |
| 241 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) }, | 241 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) }, |
| 242 | { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) }, | ||
| 242 | { } | 243 | { } |
| 243 | }; | 244 | }; |
| 244 | MODULE_DEVICE_TABLE(hid, mosart_devices); | 245 | MODULE_DEVICE_TABLE(hid, mosart_devices); |