Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa77f6c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] move the remaining USB drivers to drivers/media/usb 



Move the 3 remaining usb drivers to their proper space.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0c0d06ca

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7371,7 +7371,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git 
W:	http://royale.zerezo.com/zr364xx/

S:	Maintained

F:	Documentation/video4linux/zr364xx.txt

F:	drivers/media/video/zr364xx.c

F:	drivers/media/usb/zr364xx.c



USER-MODE LINUX (UML)

M:	Jeff Dike <jdike@addtoit.com>

drivers/media/usb/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ source "drivers/media/usb/uvc/Kconfig" 
source "drivers/media/usb/gspca/Kconfig"

source "drivers/media/usb/pwc/Kconfig"

source "drivers/media/usb/cpia2/Kconfig"

source "drivers/media/usb/zr364xx/Kconfig"

source "drivers/media/usb/stkwebcam/Kconfig"

source "drivers/media/usb/s2255/Kconfig"

source "drivers/media/usb/sn9c102/Kconfig"

endif

drivers/media/usb/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


# DVB USB-only drivers

obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/

obj-y := zr364xx/ stkwebcam/ s2255/



obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/

obj-$(CONFIG_USB_GSPCA)         += gspca/

obj-$(CONFIG_USB_PWC)           += pwc/

drivers/media/usb/s2255/Kconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
config USB_S2255

	tristate "USB Sensoray 2255 video capture device"

	depends on VIDEO_V4L2

	select VIDEOBUF_VMALLOC

	default n

	help

	  Say Y here if you want support for the Sensoray 2255 USB device.

	  This driver can be compiled as a module, called s2255drv.

drivers/media/usb/s2255/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_USB_S2255)		+= s2255drv.o