diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /drivers/media/video/gspca/sonixb.c | |
| parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'drivers/media/video/gspca/sonixb.c')
| -rw-r--r-- | drivers/media/video/gspca/sonixb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c index 785eeb4c2014..95354a339e3d 100644 --- a/drivers/media/video/gspca/sonixb.c +++ b/drivers/media/video/gspca/sonixb.c | |||
| @@ -1453,9 +1453,7 @@ static const struct usb_device_id device_table[] __devinitconst = { | |||
| 1453 | {USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)}, | 1453 | {USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)}, |
| 1454 | {USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)}, | 1454 | {USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)}, |
| 1455 | {USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)}, | 1455 | {USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)}, |
| 1456 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE | ||
| 1457 | {USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)}, | 1456 | {USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)}, |
| 1458 | #endif | ||
| 1459 | {USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)}, | 1457 | {USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)}, |
| 1460 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE | 1458 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE |
| 1461 | {USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)}, | 1459 | {USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)}, |