diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-02 10:03:33 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-02 07:58:15 -0400 |
| commit | 06f3ed23b1e1038da649c4836b51fe035f5536bd (patch) | |
| tree | 232453ed09230753899072b77b5c1371ef858053 /drivers/media/video | |
| parent | c0efd232929c2cd87238de2cccdaf4e845be5b0c (diff) | |
V4L/DVB (8178): uvc: Fix compilation breakage for the other drivers, if uvc is selected
UVC makefile defines obj as:
obj-$(CONFIG_USB_VIDEO_CLASS) := uvcvideo.o
Instead of:
obj-$(CONFIG_USB_VIDEO_CLASS) += uvcvideo.o
Due to that, if uvc is selected, all obj-y or obj-m that were added to
compilation were forget. This breaks a proper kernel build.
Acked-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/uvc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/Makefile b/drivers/media/video/uvc/Makefile index fb39bbf9b5ac..968c1994eda0 100644 --- a/drivers/media/video/uvc/Makefile +++ b/drivers/media/video/uvc/Makefile | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \ | 1 | uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \ |
| 2 | uvc_status.o uvc_isight.o | 2 | uvc_status.o uvc_isight.o |
| 3 | obj-$(CONFIG_USB_VIDEO_CLASS) := uvcvideo.o | 3 | obj-$(CONFIG_USB_VIDEO_CLASS) += uvcvideo.o |