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

Commit cc11b140 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] dt3155: move out of staging into drivers/media/pci 



The dt3155 code is now in good shape, so move it out of staging into
drivers/media/pci. Mark in MAINTAINERS that I'll do Odd Fixes for this
driver.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c34b7ef5

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -3426,6 +3426,14 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/wan/dscc4.c



DT3155 MEDIA DRIVER

M:	Hans Verkuil <hverkuil@xs4all.nl>

L:	linux-media@vger.kernel.org

T:	git git://linuxtv.org/media_tree.git

W:	http://linuxtv.org

S:	Odd Fixes

F:	drivers/media/pci/dt3155/



DVB_USB_AF9015 MEDIA DRIVER

M:	Antti Palosaari <crope@iki.fi>

L:	linux-media@vger.kernel.org

drivers/media/pci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ source "drivers/media/pci/zoran/Kconfig" 
source "drivers/media/pci/saa7146/Kconfig"

source "drivers/media/pci/solo6x10/Kconfig"

source "drivers/media/pci/tw68/Kconfig"

source "drivers/media/pci/dt3155/Kconfig"

endif



if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT

drivers/media/pci/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ obj-$(CONFIG_VIDEO_BT848) += bt8xx/ 
obj-$(CONFIG_VIDEO_SAA7134) += saa7134/

obj-$(CONFIG_VIDEO_SAA7164) += saa7164/

obj-$(CONFIG_VIDEO_TW68) += tw68/

obj-$(CONFIG_VIDEO_DT3155) += dt3155/

obj-$(CONFIG_VIDEO_MEYE) += meye/

obj-$(CONFIG_STA2X11_VIP) += sta2x11/

obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/

drivers/staging/media/dt3155v4l/Kconfig→drivers/media/pci/dt3155/Kconfig

+2 −2
Original line number Diff line number Diff line 
config VIDEO_DT3155

	tristate "DT3155 frame grabber, Video4Linux interface"

	tristate "DT3155 frame grabber"

	depends on PCI && VIDEO_DEV && VIDEO_V4L2

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG
@@ -10,4 +10,4 @@ config VIDEO_DT3155 
	  In doubt, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called dt3155v4l.
 
	  module will be called dt3155.

drivers/media/pci/dt3155/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_VIDEO_DT3155)	+= dt3155.o