[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: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
mariux64 · Jul 22, 2014 · 7955f03 · 7955f03
1 parent 28cae86
commit 7955f03
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 1,181 deletions.
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
@@ -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)

diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
@@ -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/
diff --git a/drivers/staging/media/go7007/Kconfig → drivers/media/usb/go7007/Kconfig b/drivers/staging/media/go7007/Kconfig → drivers/media/usb/go7007/Kconfig
diff --git a/drivers/staging/media/go7007/Makefile → drivers/media/usb/go7007/Makefile b/drivers/staging/media/go7007/Makefile → drivers/media/usb/go7007/Makefile
@@ -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
diff --git a/drivers/staging/media/go7007/go7007-driver.c → drivers/media/usb/go7007/go7007-driver.c b/drivers/staging/media/go7007/go7007-driver.c → drivers/media/usb/go7007/go7007-driver.c
diff --git a/drivers/staging/media/go7007/go7007-fw.c → drivers/media/usb/go7007/go7007-fw.c b/drivers/staging/media/go7007/go7007-fw.c → drivers/media/usb/go7007/go7007-fw.c
diff --git a/drivers/staging/media/go7007/go7007-i2c.c → drivers/media/usb/go7007/go7007-i2c.c b/drivers/staging/media/go7007/go7007-i2c.c → drivers/media/usb/go7007/go7007-i2c.c
diff --git a/drivers/staging/media/go7007/go7007-loader.c → drivers/media/usb/go7007/go7007-loader.c b/drivers/staging/media/go7007/go7007-loader.c → drivers/media/usb/go7007/go7007-loader.c
diff --git a/drivers/staging/media/go7007/go7007-priv.h → drivers/media/usb/go7007/go7007-priv.h b/drivers/staging/media/go7007/go7007-priv.h → drivers/media/usb/go7007/go7007-priv.h
diff --git a/drivers/staging/media/go7007/go7007-usb.c → drivers/media/usb/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c → drivers/media/usb/go7007/go7007-usb.c
diff --git a/drivers/staging/media/go7007/go7007-v4l2.c → drivers/media/usb/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c → drivers/media/usb/go7007/go7007-v4l2.c
diff --git a/drivers/staging/media/go7007/s2250-board.c → drivers/media/usb/go7007/s2250-board.c b/drivers/staging/media/go7007/s2250-board.c → drivers/media/usb/go7007/s2250-board.c
diff --git a/drivers/staging/media/go7007/snd-go7007.c → drivers/media/usb/go7007/snd-go7007.c b/drivers/staging/media/go7007/snd-go7007.c → drivers/media/usb/go7007/snd-go7007.c
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
@@ -29,8 +29,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig"
 
 source "drivers/staging/media/dt3155v4l/Kconfig"
 
-source "drivers/staging/media/go7007/Kconfig"
-
 source "drivers/staging/media/omap24xx/Kconfig"
 
 source "drivers/staging/media/omap4iss/Kconfig"

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_VIDEO_DT3155)	+= dt3155v4l/
-obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/
 obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
 obj-$(CONFIG_VIDEO_OMAP2)       += omap24xx/

diff --git a/drivers/staging/media/go7007/README b/drivers/staging/media/go7007/README