diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /drivers/media/video/gspca/sq905.c | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'drivers/media/video/gspca/sq905.c')
| -rw-r--r-- | drivers/media/video/gspca/sq905.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c index 40406774577..2e9c0617519 100644 --- a/drivers/media/video/gspca/sq905.c +++ b/drivers/media/video/gspca/sq905.c | |||
| @@ -396,7 +396,7 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | /* Table of supported USB devices */ | 398 | /* Table of supported USB devices */ |
| 399 | static const __devinitdata struct usb_device_id device_table[] = { | 399 | static const struct usb_device_id device_table[] = { |
| 400 | {USB_DEVICE(0x2770, 0x9120)}, | 400 | {USB_DEVICE(0x2770, 0x9120)}, |
| 401 | {} | 401 | {} |
| 402 | }; | 402 | }; |