diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 11:46:43 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 11:46:43 -0700 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /drivers/media/video/gspca/sn9c2028.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
| download | blackbird-op-linux-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.gz blackbird-op-linux-c64eae9a73a847c1698f913c893aa4012d2a30b0.zip | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'drivers/media/video/gspca/sn9c2028.c')
| -rw-r--r-- | drivers/media/video/gspca/sn9c2028.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/sn9c2028.c b/drivers/media/video/gspca/sn9c2028.c index 40a06680502d..4271f86dfe01 100644 --- a/drivers/media/video/gspca/sn9c2028.c +++ b/drivers/media/video/gspca/sn9c2028.c @@ -703,7 +703,7 @@ static const struct sd_desc sd_desc = { }; /* -- module initialisation -- */ -static const __devinitdata struct usb_device_id device_table[] = { +static const struct usb_device_id device_table[] = { {USB_DEVICE(0x0458, 0x7005)}, /* Genius Smart 300, version 2 */ /* The Genius Smart is untested. I can't find an owner ! */ /* {USB_DEVICE(0x0c45, 0x8000)}, DC31VC, Don't know this camera */ |
