diff options
| author | Don Prince <dhprince.devel@yahoo.co.uk> | 2010-05-17 11:42:39 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-17 13:36:44 +0200 |
| commit | b355850ba383232d4e0e357c1cda8cb7bfcc60bc (patch) | |
| tree | 760dfd1b7fe7aaf5ef45ffa5ec28ef7dc54b9dd3 /drivers/hid/hid-core.c | |
| parent | a9885c8f7bf62e251fc178f838b9f0ee897c158a (diff) | |
| download | talos-obmc-linux-b355850ba383232d4e0e357c1cda8cb7bfcc60bc.tar.gz talos-obmc-linux-b355850ba383232d4e0e357c1cda8cb7bfcc60bc.zip | |
HID: hid-samsung: add support for Creative Desktop Wireless 6000
Add support for the multimedia buttons of the Creative Desktop Wireless 6000
keyboard/mouse combo which are not currently handled by the default/samsung HID
driver.
Signed-off-by: Don Prince <dhprince-devel@yahoo.co.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 7c77c64d3e99..c625c3419a8c 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1346,6 +1346,7 @@ static const struct hid_device_id hid_blacklist[] = { { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) }, { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, + { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, |
