summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-02 16:03:33 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-02 13:58:15 +0200
commit06f3ed23b1e1038da649c4836b51fe035f5536bd (patch)
tree232453ed09230753899072b77b5c1371ef858053
parentV4L/DVB (8145a): USB Video Class driver (diff)
downloadlinux-06f3ed23b1e1038da649c4836b51fe035f5536bd.tar.xz
linux-06f3ed23b1e1038da649c4836b51fe035f5536bd.zip
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>
-rw-r--r--drivers/media/video/uvc/Makefile2
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 @@
uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \
uvc_status.o uvc_isight.o
-obj-$(CONFIG_USB_VIDEO_CLASS) := uvcvideo.o
+obj-$(CONFIG_USB_VIDEO_CLASS) += uvcvideo.o