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

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

[media] go7007: move out of staging into drivers/media/usb. 



Now that the custom motion detection API in this driver has been
replaced with a standard API there is no reason anymore to keep it
in staging. So (finally!) move it to drivers/media/usb.

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

drivers/media/usb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ source "drivers/media/usb/hdpvr/Kconfig" 
source "drivers/media/usb/tlg2300/Kconfig"

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

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

source "drivers/media/usb/go7007/Kconfig"

endif



if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT)

drivers/media/usb/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,3 +22,4 @@ obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/ 
obj-$(CONFIG_VIDEO_TM6000) += tm6000/

obj-$(CONFIG_VIDEO_EM28XX) += em28xx/

obj-$(CONFIG_VIDEO_USBTV) += usbtv/

obj-$(CONFIG_VIDEO_GO7007) += go7007/

drivers/staging/media/go7007/Makefile→drivers/media/usb/go7007/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -8,8 +8,4 @@ go7007-y := go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o \ 


s2250-y := s2250-board.o



# Uncomment when the saa7134 patches get into upstream

#obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o

#ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/pci/saa7134



ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -Idrivers/media/common