diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
| commit | 4b5a5096bb834102b2e821f5f34274f041862d67 (patch) | |
| tree | fe55f4f11111e34d503a6a01aeb4bfc2eae5e88a /drivers/media/usb/gspca/sunplus.c | |
| parent | 19570d747795f0ecff79403698b868dc5ad7fa86 (diff) | |
| parent | 150116bcfbd9004f01e682535baddaca2b90d3b2 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/media/usb/gspca/sunplus.c')
| -rw-r--r-- | drivers/media/usb/gspca/sunplus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/usb/gspca/sunplus.c b/drivers/media/usb/gspca/sunplus.c index a517d185febe..46c9f2229a18 100644 --- a/drivers/media/usb/gspca/sunplus.c +++ b/drivers/media/usb/gspca/sunplus.c @@ -1027,6 +1027,7 @@ static const struct usb_device_id device_table[] = { {USB_DEVICE(0x055f, 0xc650), BS(SPCA533, 0)}, {USB_DEVICE(0x05da, 0x1018), BS(SPCA504B, 0)}, {USB_DEVICE(0x06d6, 0x0031), BS(SPCA533, 0)}, + {USB_DEVICE(0x06d6, 0x0041), BS(SPCA504B, 0)}, {USB_DEVICE(0x0733, 0x1311), BS(SPCA533, 0)}, {USB_DEVICE(0x0733, 0x1314), BS(SPCA533, 0)}, {USB_DEVICE(0x0733, 0x2211), BS(SPCA533, 0)}, |