summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-02 08:03:33 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-02 08:03:33 -0300
commitb2b85879a72aa3699aca102b5d8ffff2d2de58f1 (patch)
tree75df01be1d6a3cec2c114d081be74b809028ba6e /linux/drivers
parent945799d8b375844541b1cce69783ccfcc0fae297 (diff)
downloadmediapointer-dvb-s2-b2b85879a72aa3699aca102b5d8ffff2d2de58f1.tar.gz
mediapointer-dvb-s2-b2b85879a72aa3699aca102b5d8ffff2d2de58f1.tar.bz2
uvc: Fix compilation breakage for the other drivers, if uvc is selected
From: Mauro Carvalho Chehab <mchehab@infradead.org> 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. CC: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/uvc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/uvc/Makefile b/linux/drivers/media/video/uvc/Makefile
index fb39bbf9b..968c1994e 100644
--- a/linux/drivers/media/video/uvc/Makefile
+++ b/linux/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