diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:05:18 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:05:24 -0400 |
| commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
| tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /drivers/usb/gadget/webcam.c | |
| parent | 167ffc44caaee68ea60dadf6931a4d195a4ed1f0 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'drivers/usb/gadget/webcam.c')
| -rw-r--r-- | drivers/usb/gadget/webcam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c index 417fd6887698..f5f3030cc416 100644 --- a/drivers/usb/gadget/webcam.c +++ b/drivers/usb/gadget/webcam.c | |||
| @@ -28,10 +28,10 @@ | |||
| 28 | #include "config.c" | 28 | #include "config.c" |
| 29 | #include "epautoconf.c" | 29 | #include "epautoconf.c" |
| 30 | 30 | ||
| 31 | #include "f_uvc.c" | ||
| 32 | #include "uvc_queue.c" | 31 | #include "uvc_queue.c" |
| 33 | #include "uvc_v4l2.c" | ||
| 34 | #include "uvc_video.c" | 32 | #include "uvc_video.c" |
| 33 | #include "uvc_v4l2.c" | ||
| 34 | #include "f_uvc.c" | ||
| 35 | 35 | ||
| 36 | /* -------------------------------------------------------------------------- | 36 | /* -------------------------------------------------------------------------- |
| 37 | * Device descriptor | 37 | * Device descriptor |