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

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

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



Now that the custom motion detection API has been replaced with a
standard API there is no reason anymore to keep it in staging.

So (finally!) move it to drivers/media/pci.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 401e972f

drivers/media/pci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ if MEDIA_ANALOG_TV_SUPPORT 
source "drivers/media/pci/ivtv/Kconfig"

source "drivers/media/pci/zoran/Kconfig"

source "drivers/media/pci/saa7146/Kconfig"

source "drivers/media/pci/solo6x10/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,3 +24,4 @@ obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ 
obj-$(CONFIG_VIDEO_SAA7164) += saa7164/

obj-$(CONFIG_VIDEO_MEYE) += meye/

obj-$(CONFIG_STA2X11_VIP) += sta2x11/

obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/

drivers/staging/media/solo6x10/Kconfig→drivers/media/pci/solo6x10/Kconfig

+1 −1
Original line number Diff line number Diff line 
config SOLO6X10

config VIDEO_SOLO6X10

	tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)"

	depends on PCI && VIDEO_DEV && SND && I2C

	select BITREVERSE

drivers/staging/media/solo6x10/Makefile→drivers/media/pci/solo6x10/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ solo6x10-y := solo6x10-core.o solo6x10-i2c.o solo6x10-p2m.o solo6x10-v4l2.o \ 
		solo6x10-tw28.o solo6x10-gpio.o solo6x10-disp.o solo6x10-enc.o \

		solo6x10-v4l2-enc.o solo6x10-g723.o solo6x10-eeprom.o



obj-$(CONFIG_SOLO6X10) += solo6x10.o
 
obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10.o