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

Hide file tree

Showing 23 changed files with 4 additions and 20 deletions.
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
@@ -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

diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
@@ -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/
diff --git a/drivers/staging/media/solo6x10/Kconfig → drivers/media/pci/solo6x10/Kconfig b/drivers/staging/media/solo6x10/Kconfig → drivers/media/pci/solo6x10/Kconfig
@@ -1,4 +1,4 @@
-config SOLO6X10
+config VIDEO_SOLO6X10
 	tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)"
 	depends on PCI && VIDEO_DEV && SND && I2C
 	select BITREVERSE

diff --git a/drivers/staging/media/solo6x10/Makefile → drivers/media/pci/solo6x10/Makefile b/drivers/staging/media/solo6x10/Makefile → drivers/media/pci/solo6x10/Makefile
@@ -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
diff --git a/...rs/staging/media/solo6x10/solo6x10-core.c → drivers/media/pci/solo6x10/solo6x10-core.c b/...rs/staging/media/solo6x10/solo6x10-core.c → drivers/media/pci/solo6x10/solo6x10-core.c
diff --git a/...rs/staging/media/solo6x10/solo6x10-disp.c → drivers/media/pci/solo6x10/solo6x10-disp.c b/...rs/staging/media/solo6x10/solo6x10-disp.c → drivers/media/pci/solo6x10/solo6x10-disp.c
diff --git a/.../staging/media/solo6x10/solo6x10-eeprom.c → drivers/media/pci/solo6x10/solo6x10-eeprom.c b/.../staging/media/solo6x10/solo6x10-eeprom.c → drivers/media/pci/solo6x10/solo6x10-eeprom.c
diff --git a/...ers/staging/media/solo6x10/solo6x10-enc.c → drivers/media/pci/solo6x10/solo6x10-enc.c b/...ers/staging/media/solo6x10/solo6x10-enc.c → drivers/media/pci/solo6x10/solo6x10-enc.c
diff --git a/...rs/staging/media/solo6x10/solo6x10-g723.c → drivers/media/pci/solo6x10/solo6x10-g723.c b/...rs/staging/media/solo6x10/solo6x10-g723.c → drivers/media/pci/solo6x10/solo6x10-g723.c
diff --git a/...rs/staging/media/solo6x10/solo6x10-gpio.c → drivers/media/pci/solo6x10/solo6x10-gpio.c b/...rs/staging/media/solo6x10/solo6x10-gpio.c → drivers/media/pci/solo6x10/solo6x10-gpio.c
diff --git a/...ers/staging/media/solo6x10/solo6x10-i2c.c → drivers/media/pci/solo6x10/solo6x10-i2c.c b/...ers/staging/media/solo6x10/solo6x10-i2c.c → drivers/media/pci/solo6x10/solo6x10-i2c.c
diff --git a/...rs/staging/media/solo6x10/solo6x10-jpeg.h → drivers/media/pci/solo6x10/solo6x10-jpeg.h b/...rs/staging/media/solo6x10/solo6x10-jpeg.h → drivers/media/pci/solo6x10/solo6x10-jpeg.h
diff --git a/...staging/media/solo6x10/solo6x10-offsets.h → ...ers/media/pci/solo6x10/solo6x10-offsets.h b/...staging/media/solo6x10/solo6x10-offsets.h → ...ers/media/pci/solo6x10/solo6x10-offsets.h
diff --git a/...ers/staging/media/solo6x10/solo6x10-p2m.c → drivers/media/pci/solo6x10/solo6x10-p2m.c b/...ers/staging/media/solo6x10/solo6x10-p2m.c → drivers/media/pci/solo6x10/solo6x10-p2m.c
diff --git a/...rs/staging/media/solo6x10/solo6x10-regs.h → drivers/media/pci/solo6x10/solo6x10-regs.h b/...rs/staging/media/solo6x10/solo6x10-regs.h → drivers/media/pci/solo6x10/solo6x10-regs.h
diff --git a/...rs/staging/media/solo6x10/solo6x10-tw28.c → drivers/media/pci/solo6x10/solo6x10-tw28.c b/...rs/staging/media/solo6x10/solo6x10-tw28.c → drivers/media/pci/solo6x10/solo6x10-tw28.c
diff --git a/...rs/staging/media/solo6x10/solo6x10-tw28.h → drivers/media/pci/solo6x10/solo6x10-tw28.h b/...rs/staging/media/solo6x10/solo6x10-tw28.h → drivers/media/pci/solo6x10/solo6x10-tw28.h
diff --git a/...taging/media/solo6x10/solo6x10-v4l2-enc.c → ...rs/media/pci/solo6x10/solo6x10-v4l2-enc.c b/...taging/media/solo6x10/solo6x10-v4l2-enc.c → ...rs/media/pci/solo6x10/solo6x10-v4l2-enc.c
diff --git a/...rs/staging/media/solo6x10/solo6x10-v4l2.c → drivers/media/pci/solo6x10/solo6x10-v4l2.c b/...rs/staging/media/solo6x10/solo6x10-v4l2.c → drivers/media/pci/solo6x10/solo6x10-v4l2.c
diff --git a/drivers/staging/media/solo6x10/solo6x10.h → drivers/media/pci/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h → drivers/media/pci/solo6x10/solo6x10.h
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
@@ -33,8 +33,6 @@ source "drivers/staging/media/go7007/Kconfig"
 
 source "drivers/staging/media/omap24xx/Kconfig"
 
-source "drivers/staging/media/solo6x10/Kconfig"
-
 source "drivers/staging/media/omap4iss/Kconfig"
 
 # Keep LIRC at the end, as it has sub-menus

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
@@ -2,7 +2,6 @@ obj-$(CONFIG_DVB_AS102)		+= as102/
 obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
-obj-$(CONFIG_SOLO6X10)		+= solo6x10/
 obj-$(CONFIG_VIDEO_DT3155)	+= dt3155v4l/
 obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
 obj-$(CONFIG_VIDEO_DM365_VPFE)	+= davinci_vpfe/

diff --git a/drivers/staging/media/solo6x10/TODO b/drivers/staging/media/solo6x10/TODO