Commit 3a57a788 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (8178): uvc: Fix compilation breakage for the other drivers, if uvc is selected
  V4L/DVB (8145a): USB Video Class driver
parents a16b4bcd 06f3ed23

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -4314,6 +4314,14 @@ L: netdev@vger.kernel.org 
W:	http://www.linux-usb.org/usbnet

S:	Maintained



USB VIDEO CLASS

P:	Laurent Pinchart

M:	laurent.pinchart@skynet.be

L:	linx-uvc-devel@berlios.de

L:	video4linux-list@redhat.com

W:	http://linux-uvc.berlios.de

S:	Maintained



USB W996[87]CF DRIVER

P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

drivers/media/video/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -793,6 +793,14 @@ menuconfig V4L_USB_DRIVERS 


if V4L_USB_DRIVERS && USB



config USB_VIDEO_CLASS

	tristate "USB Video Class (UVC)"

	---help---

	  Support for the USB Video Class (UVC).  Currently only video

	  input devices, such as webcams, are supported.



	  For more information see: <http://linux-uvc.berlios.de/>



source "drivers/media/video/pvrusb2/Kconfig"



source "drivers/media/video/em28xx/Kconfig"

drivers/media/video/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o 


obj-$(CONFIG_VIDEO_AU0828) += au0828/



obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/



EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core

EXTRA_CFLAGS += -Idrivers/media/dvb/frontends

EXTRA_CFLAGS += -Idrivers/media/common/tuners

drivers/media/video/uvc/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
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