diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-23 18:22:16 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-24 19:27:32 +0100 |
| commit | 8a327f23e23fa509e6e3c2263ae1cc0a67dec387 (patch) | |
| tree | 119abf09e1ec9babaf78e6889187f9d54864b118 /drivers/media/video/gspca/sq905.c | |
| parent | drm/i915: Handle the no-interrupts case for UMS by polling (diff) | |
| parent | Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/... (diff) | |
| download | linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.tar.xz linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.zip | |
Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
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 404067745775..2e9c06175192 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) } /* Table of supported USB devices */ -static const __devinitdata struct usb_device_id device_table[] = { +static const struct usb_device_id device_table[] = { {USB_DEVICE(0x2770, 0x9120)}, {} }; |