diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 10:07:34 -0400 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /drivers/media/video/gspca/sonixb.c | |
| parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
| parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) | |
Merge branch 'fix/misc' into topic/misc
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)}, |