]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (8178): uvc: Fix compilation breakage for the other drivers, if uvc is selected
authorMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 2 Jul 2008 14:03:33 +0000 (11:03 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 2 Jul 2008 11:58:15 +0000 (08:58 -0300)
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>
drivers/media/video/uvc/Makefile

index fb39bbf9b5acd6831075081af677d2325c0921f4..968c1994eda01f8ec87b2a95c803fc30a927bbde 100644 (file)
@@ -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