diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:47:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:47:44 -0400 |
| commit | 8762541f067d371320731510669e27f5cc40af38 (patch) | |
| tree | fa2890094858614a947ba70612854acde9888940 /drivers/hid/hid-ids.h | |
| parent | 6dbb35b0a74b44b2a48a5373d48074c5aa69fdf5 (diff) | |
| parent | adfe1560de1c696324554fba70c92f2d7c947ff7 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull second set of media updates from Mauro Carvalho Chehab:
- radio API: add support to work with radio frequency bands
- new AM/FM radio drivers: radio-shark, radio-shark2
- new Remote Controller USB driver: iguanair
- conversion of several drivers to the v4l2 core control framework
- new board additions at existing drivers
- the remaining (and vast majority of the patches) are due to
drivers/DocBook fixes/cleanups.
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (154 commits)
[media] radio-tea5777: use library for 64bits div
[media] tlg2300: Declare MODULE_FIRMWARE usage
[media] lgs8gxx: Declare MODULE_FIRMWARE usage
[media] xc5000: Add MODULE_FIRMWARE statements
[media] s2255drv: Add MODULE_FIRMWARE statement
[media] dib8000: move dereference after check for NULL
[media] Documentation: Update cardlists
[media] bttv: add support for Aposonic W-DVR
[media] cx25821: Remove bad strcpy to read-only char*
[media] pms.c: remove duplicated include
[media] smiapp-core.c: remove duplicated include
[media] via-camera: pass correct format settings to sensor
[media] rtl2832.c: minor cleanup
[media] Add support for the IguanaWorks USB IR Transceiver
[media] Minor cleanups for MCE USB
[media] drivers/media/dvb/siano/smscoreapi.c: use list_for_each_entry
[media] Use a named union in struct v4l2_ioctl_info
[media] mceusb: Add Twisted Melon USB IDs
[media] staging/media/solo6x10: use module_pci_driver macro
[media] staging/media/dt3155v4l: use module_pci_driver macro
...
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 41c34f21bd00..1dcb76ff51e3 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -333,6 +333,7 @@ | |||
| 333 | #define USB_VENDOR_ID_GRIFFIN 0x077d | 333 | #define USB_VENDOR_ID_GRIFFIN 0x077d |
| 334 | #define USB_DEVICE_ID_POWERMATE 0x0410 | 334 | #define USB_DEVICE_ID_POWERMATE 0x0410 |
| 335 | #define USB_DEVICE_ID_SOUNDKNOB 0x04AA | 335 | #define USB_DEVICE_ID_SOUNDKNOB 0x04AA |
| 336 | #define USB_DEVICE_ID_RADIOSHARK 0x627a | ||
| 336 | 337 | ||
| 337 | #define USB_VENDOR_ID_GTCO 0x078c | 338 | #define USB_VENDOR_ID_GTCO 0x078c |
| 338 | #define USB_DEVICE_ID_GTCO_90 0x0090 | 339 | #define USB_DEVICE_ID_GTCO_90 0x0090 |