Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
28cae868 401e972f

+4 -20
+1
drivers/media/pci/Kconfig
··· 19 19 source "drivers/media/pci/ivtv/Kconfig" 20 20 source "drivers/media/pci/zoran/Kconfig" 21 21 source "drivers/media/pci/saa7146/Kconfig" 22 + source "drivers/media/pci/solo6x10/Kconfig" 22 23 endif 23 24 24 25 if MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT
+1
drivers/media/pci/Makefile
··· 24 24 obj-$(CONFIG_VIDEO_SAA7164) += saa7164/ 25 25 obj-$(CONFIG_VIDEO_MEYE) += meye/ 26 26 obj-$(CONFIG_STA2X11_VIP) += sta2x11/ 27 + obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/
-2
drivers/staging/media/Kconfig
··· 33 33 34 34 source "drivers/staging/media/omap24xx/Kconfig" 35 35 36 - source "drivers/staging/media/solo6x10/Kconfig" 37 - 38 36 source "drivers/staging/media/omap4iss/Kconfig" 39 37 40 38 # Keep LIRC at the end, as it has sub-menus
-1
drivers/staging/media/Makefile
··· 2 2 obj-$(CONFIG_I2C_BCM2048) += bcm2048/ 3 3 obj-$(CONFIG_DVB_CXD2099) += cxd2099/ 4 4 obj-$(CONFIG_LIRC_STAGING) += lirc/ 5 - obj-$(CONFIG_SOLO6X10) += solo6x10/ 6 5 obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ 7 6 obj-$(CONFIG_VIDEO_GO7007) += go7007/ 8 7 obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
+1 -1
drivers/staging/media/solo6x10/Kconfig drivers/media/pci/solo6x10/Kconfig
··· 1 - config SOLO6X10 1 + config VIDEO_SOLO6X10 2 2 tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)" 3 3 depends on PCI && VIDEO_DEV && SND && I2C 4 4 select BITREVERSE
+1 -1
drivers/staging/media/solo6x10/Makefile drivers/media/pci/solo6x10/Makefile
··· 2 2 solo6x10-tw28.o solo6x10-gpio.o solo6x10-disp.o solo6x10-enc.o \ 3 3 solo6x10-v4l2-enc.o solo6x10-g723.o solo6x10-eeprom.o 4 4 5 - obj-$(CONFIG_SOLO6X10) += solo6x10.o 5 + obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10.o
-15
drivers/staging/media/solo6x10/TODO
··· 1 - - batch up desc requests for more efficient use of p2m? 2 - - encoder on/off controls 3 - - mpeg cid bitrate mode (vbr/cbr) 4 - - mpeg cid bitrate/bitrate-peak 5 - - mpeg encode of user data 6 - - mpeg decode of user data 7 - - implement CID controls for mozaic areas 8 - 9 - - sound 10 - - implement playback via external sound jack 11 - - implement loopback of external sound jack with incoming audio? 12 - - implement pause/resume (make use of in bc-server) 13 - 14 - Please send patches to the linux media list <linux-media@vger.kernel.org> and 15 - Cc Ismael Luceno <ismael.luceno@corp.bluecherry.net>.
drivers/staging/media/solo6x10/solo6x10-core.c drivers/media/pci/solo6x10/solo6x10-core.c
drivers/staging/media/solo6x10/solo6x10-disp.c drivers/media/pci/solo6x10/solo6x10-disp.c
drivers/staging/media/solo6x10/solo6x10-eeprom.c drivers/media/pci/solo6x10/solo6x10-eeprom.c
drivers/staging/media/solo6x10/solo6x10-enc.c drivers/media/pci/solo6x10/solo6x10-enc.c
drivers/staging/media/solo6x10/solo6x10-g723.c drivers/media/pci/solo6x10/solo6x10-g723.c
drivers/staging/media/solo6x10/solo6x10-gpio.c drivers/media/pci/solo6x10/solo6x10-gpio.c
drivers/staging/media/solo6x10/solo6x10-i2c.c drivers/media/pci/solo6x10/solo6x10-i2c.c
drivers/staging/media/solo6x10/solo6x10-jpeg.h drivers/media/pci/solo6x10/solo6x10-jpeg.h
drivers/staging/media/solo6x10/solo6x10-offsets.h drivers/media/pci/solo6x10/solo6x10-offsets.h
drivers/staging/media/solo6x10/solo6x10-p2m.c drivers/media/pci/solo6x10/solo6x10-p2m.c
drivers/staging/media/solo6x10/solo6x10-regs.h drivers/media/pci/solo6x10/solo6x10-regs.h
drivers/staging/media/solo6x10/solo6x10-tw28.c drivers/media/pci/solo6x10/solo6x10-tw28.c
drivers/staging/media/solo6x10/solo6x10-tw28.h drivers/media/pci/solo6x10/solo6x10-tw28.h
drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
drivers/staging/media/solo6x10/solo6x10-v4l2.c drivers/media/pci/solo6x10/solo6x10-v4l2.c
drivers/staging/media/solo6x10/solo6x10.h drivers/media/pci/solo6x10/solo6x10.h