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

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

[media] rename most media/video usb drivers to media/usb 



Rename all USB drivers with their own directory under
drivers/media/video into drivers/media/usb and update the
building system.

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

MAINTAINERS

+11 −11
Original line number Diff line number Diff line
@@ -3119,49 +3119,49 @@ M: Frank Zago <frank@zago.net> 
L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

S:	Maintained

F:	drivers/media/video/gspca/finepix.c

F:	drivers/media/usb/gspca/finepix.c



GSPCA GL860 SUBDRIVER

M:	Olivier Lorin <o.lorin@laposte.net>

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

S:	Maintained

F:	drivers/media/video/gspca/gl860/

F:	drivers/media/usb/gspca/gl860/



GSPCA M5602 SUBDRIVER

M:	Erik Andren <erik.andren@gmail.com>

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

S:	Maintained

F:	drivers/media/video/gspca/m5602/

F:	drivers/media/usb/gspca/m5602/



GSPCA PAC207 SONIXB SUBDRIVER

M:	Hans de Goede <hdegoede@redhat.com>

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

S:	Maintained

F:	drivers/media/video/gspca/pac207.c

F:	drivers/media/usb/gspca/pac207.c



GSPCA SN9C20X SUBDRIVER

M:	Brian Johnson <brijohn@gmail.com>

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

S:	Maintained

F:	drivers/media/video/gspca/sn9c20x.c

F:	drivers/media/usb/gspca/sn9c20x.c



GSPCA T613 SUBDRIVER

M:	Leandro Costantino <lcostantino@gmail.com>

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

S:	Maintained

F:	drivers/media/video/gspca/t613.c

F:	drivers/media/usb/gspca/t613.c



GSPCA USB WEBCAM DRIVER

M:	Hans de Goede <hdegoede@redhat.com>

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

S:	Maintained

F:	drivers/media/video/gspca/

F:	drivers/media/usb/gspca/



HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER

M:	Frank Seidel <frank@f-seidel.de>
@@ -5525,7 +5525,7 @@ W: http://www.isely.net/pvrusb2/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

S:	Maintained

F:	Documentation/video4linux/README.pvrusb2

F:	drivers/media/video/pvrusb2/

F:	drivers/media/usb/pvrusb2/



PWM SUBSYSTEM

M:	Thierry Reding <thierry.reding@avionic-design.de>
@@ -5956,7 +5956,7 @@ M: Huang Shijie <shijie8@gmail.com> 
M:	Kang Yong <kangyong@telegent.com>

M:	Zhang Xiaobing <xbzhang@telegent.com>

S:	Supported

F:	drivers/media/video/tlg2300

F:	drivers/media/usb/tlg2300



SC1200 WDT DRIVER

M:	Zwane Mwaikambo <zwane@arm.linux.org.uk>
@@ -7297,7 +7297,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git 
W:	http://www.linux-projects.org

S:	Maintained

F:	Documentation/video4linux/sn9c102.txt

F:	drivers/media/video/sn9c102/

F:	drivers/media/usb/sn9c102/



USB SUBSYSTEM

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -7332,7 +7332,7 @@ L: linux-media@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

W:	http://www.ideasonboard.org/uvc/

S:	Maintained

F:	drivers/media/video/uvc/

F:	drivers/media/usb/uvc/



USB W996[87]CF DRIVER

M:	Luca Risolia <luca.risolia@studio.unibo.it>

drivers/media/usb/Kconfig

+36 −5
Original line number Diff line number Diff line
@@ -2,18 +2,49 @@ 
# USB media device configuration

#



menuconfig MEDIA_USB_DRIVERS

	bool "Supported DVB USB Adapters"

        depends on USB

        default y

menu "Media USB Adapters"

	visible if USB && MEDIA_SUPPORT



if MEDIA_USB_DRIVERS && DVB_CORE && I2C

if MEDIA_CAMERA_SUPPORT

	comment "Webcam devices"

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/sn9c102/Kconfig"

endif



if MEDIA_ANALOG_TV_SUPPORT

	comment "Analog TV USB devices"

source "drivers/media/usb/au0828/Kconfig"

source "drivers/media/usb/pvrusb2/Kconfig"

source "drivers/media/usb/hdpvr/Kconfig"

source "drivers/media/usb/tlg2300/Kconfig"

source "drivers/media/usb/usbvision/Kconfig"

source "drivers/media/usb/stk1160/Kconfig"



endif



if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT)

	comment "Analog/digital TV USB devices"

source "drivers/media/usb/cx231xx/Kconfig"

source "drivers/media/usb/tm6000/Kconfig"

endif





if I2C && MEDIA_DIGITAL_TV_SUPPORT

	comment "Digital TV USB devices"

source "drivers/media/usb/dvb-usb/Kconfig"

source "drivers/media/usb/dvb-usb-v2/Kconfig"

source "drivers/media/usb/ttusb-budget/Kconfig"

source "drivers/media/usb/ttusb-dec/Kconfig"

source "drivers/media/usb/siano/Kconfig"

source "drivers/media/usb/b2c2/Kconfig"

endif



if (MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT)

	comment "Webcam, TV (analog/digital) USB devices"

source "drivers/media/usb/em28xx/Kconfig"

endif



endmenu

drivers/media/usb/Makefile

+14 −0
Original line number Diff line number Diff line
@@ -4,3 +4,17 @@ 


# DVB USB-only drivers

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

obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/

obj-$(CONFIG_USB_GSPCA)         += gspca/

obj-$(CONFIG_USB_PWC)           += pwc/

obj-$(CONFIG_VIDEO_CPIA2) += cpia2/

obj-$(CONFIG_USB_SN9C102)       += sn9c102/

obj-$(CONFIG_VIDEO_AU0828) += au0828/

obj-$(CONFIG_VIDEO_HDPVR)	+= hdpvr/

obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/

obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/

obj-$(CONFIG_VIDEO_USBVISION) += usbvision/

obj-$(CONFIG_VIDEO_STK1160) += stk1160/

obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/

obj-$(CONFIG_VIDEO_TM6000) += tm6000/

obj-$(CONFIG_VIDEO_EM28XX) += em28xx/