aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sunplus.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-01-23 17:24:26 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-24 23:45:32 +0000
commitbdd92c9ad287e03a2ec52f5a89c470cd5caae1c2 (patch)
tree38d863507e900fb2ccac4c22fcf8934271c051b5 /drivers/media/video/gspca/sunplus.c
parenta37f2f87edc1b6e5932becf6e51535d36b690f2a (diff)
parent8e934dbf264418afe4d1dff34ce074ecc14280db (diff)
downloadkernel_samsung_aries-bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2.zip
kernel_samsung_aries-bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2.tar.gz
kernel_samsung_aries-bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2.tar.bz2
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge important suspend and resume regression fixes and resolve the small conflict. Conflicts: drivers/gpu/drm/i915/i915_dma.c
Diffstat (limited to 'drivers/media/video/gspca/sunplus.c')
-rw-r--r--drivers/media/video/gspca/sunplus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index a9cbcd6..543542a 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -1162,7 +1162,7 @@ static const struct sd_desc sd_desc = {
#define BS(bridge, subtype) \
.driver_info = (BRIDGE_ ## bridge << 8) \
| (subtype)
-static const __devinitdata struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x400b), BS(SPCA504C, 0)},
{USB_DEVICE(0x041e, 0x4012), BS(SPCA504C, 0)},
{USB_DEVICE(0x041e, 0x4013), BS(SPCA504C, 0)},