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

staging: Move media drivers to staging/media

In practice, it is being hard to distinguish when a patch
should go to staging tree or to the media tree. Better
to distinguish it, by putting the media drivers at a
separate staging directory. Newer staging drivers that include
anything with "dvb*.h", "v4l2*.h" or "videodev2.h" should
go to the drivers/staging/media tree.

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

+48 -22
+1 -1
drivers/media/dvb/ddbridge/Makefile
··· 11 11 ccflags-y += -Idrivers/media/common/tuners/ 12 12 13 13 # For the staging CI driver cxd2099 14 - ccflags-y += -Idrivers/staging/cxd2099/ 14 + ccflags-y += -Idrivers/staging/media/cxd2099/
+1 -1
drivers/media/dvb/ngene/Makefile
··· 11 11 ccflags-y += -Idrivers/media/common/tuners/ 12 12 13 13 # For the staging CI driver cxd2099 14 - ccflags-y += -Idrivers/staging/cxd2099/ 14 + ccflags-y += -Idrivers/staging/media/cxd2099/
+1 -13
drivers/staging/Kconfig
··· 30 30 31 31 source "drivers/staging/slicoss/Kconfig" 32 32 33 - source "drivers/staging/go7007/Kconfig" 34 - 35 - source "drivers/staging/cxd2099/Kconfig" 36 - 37 33 source "drivers/staging/usbip/Kconfig" 38 34 39 35 source "drivers/staging/winbond/Kconfig" ··· 98 102 99 103 source "drivers/staging/sm7xx/Kconfig" 100 104 101 - source "drivers/staging/dt3155v4l/Kconfig" 102 - 103 105 source "drivers/staging/crystalhd/Kconfig" 104 106 105 107 source "drivers/staging/cxt1e1/Kconfig" 106 108 107 109 source "drivers/staging/xgifb/Kconfig" 108 - 109 - source "drivers/staging/lirc/Kconfig" 110 - 111 - source "drivers/staging/easycap/Kconfig" 112 - 113 - source "drivers/staging/solo6x10/Kconfig" 114 110 115 111 source "drivers/staging/tidspbridge/Kconfig" 116 112 ··· 130 142 131 143 source "drivers/staging/nvec/Kconfig" 132 144 133 - source "drivers/staging/media/as102/Kconfig" 145 + source "drivers/staging/media/Kconfig" 134 146 135 147 endif # STAGING
+1 -7
drivers/staging/Makefile
··· 4 4 obj-$(CONFIG_STAGING) += staging.o 5 5 6 6 obj-y += serial/ 7 + obj-y += media/ 7 8 obj-$(CONFIG_ET131X) += et131x/ 8 9 obj-$(CONFIG_SLICOSS) += slicoss/ 9 - obj-$(CONFIG_VIDEO_GO7007) += go7007/ 10 - obj-$(CONFIG_DVB_CXD2099) += cxd2099/ 11 - obj-$(CONFIG_LIRC_STAGING) += lirc/ 12 10 obj-$(CONFIG_USBIP_CORE) += usbip/ 13 11 obj-$(CONFIG_W35UND) += winbond/ 14 12 obj-$(CONFIG_PRISM2_USB) += wlan-ng/ ··· 41 43 obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/ 42 44 obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/ 43 45 obj-$(CONFIG_FB_SM7XX) += sm7xx/ 44 - obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ 45 46 obj-$(CONFIG_CRYSTALHD) += crystalhd/ 46 47 obj-$(CONFIG_CXT1E1) += cxt1e1/ 47 48 obj-$(CONFIG_FB_XGI) += xgifb/ 48 - obj-$(CONFIG_EASYCAP) += easycap/ 49 - obj-$(CONFIG_SOLO6X10) += solo6x10/ 50 49 obj-$(CONFIG_TIDSPBRIDGE) += tidspbridge/ 51 50 obj-$(CONFIG_ACPI_QUICKSTART) += quickstart/ 52 51 obj-$(CONFIG_SBE_2T3E3) += sbe-2t3e3/ ··· 57 62 obj-$(CONFIG_DRM_PSB) += gma500/ 58 63 obj-$(CONFIG_INTEL_MEI) += mei/ 59 64 obj-$(CONFIG_MFD_NVEC) += nvec/ 60 - obj-$(CONFIG_DVB_AS102) += media/as102/
drivers/staging/cxd2099/Kconfig drivers/staging/media/cxd2099/Kconfig
drivers/staging/cxd2099/Makefile drivers/staging/media/cxd2099/Makefile
drivers/staging/cxd2099/TODO drivers/staging/media/cxd2099/TODO
drivers/staging/cxd2099/cxd2099.c drivers/staging/media/cxd2099/cxd2099.c
drivers/staging/cxd2099/cxd2099.h drivers/staging/media/cxd2099/cxd2099.h
drivers/staging/dt3155v4l/Kconfig drivers/staging/media/dt3155v4l/Kconfig
drivers/staging/dt3155v4l/Makefile drivers/staging/media/dt3155v4l/Makefile
drivers/staging/dt3155v4l/dt3155v4l.c drivers/staging/media/dt3155v4l/dt3155v4l.c
drivers/staging/dt3155v4l/dt3155v4l.h drivers/staging/media/dt3155v4l/dt3155v4l.h
drivers/staging/easycap/Kconfig drivers/staging/media/easycap/Kconfig
drivers/staging/easycap/Makefile drivers/staging/media/easycap/Makefile
drivers/staging/easycap/README drivers/staging/media/easycap/README
drivers/staging/easycap/easycap.h drivers/staging/media/easycap/easycap.h
drivers/staging/easycap/easycap_ioctl.c drivers/staging/media/easycap/easycap_ioctl.c
drivers/staging/easycap/easycap_low.c drivers/staging/media/easycap/easycap_low.c
drivers/staging/easycap/easycap_main.c drivers/staging/media/easycap/easycap_main.c
drivers/staging/easycap/easycap_settings.c drivers/staging/media/easycap/easycap_settings.c
drivers/staging/easycap/easycap_sound.c drivers/staging/media/easycap/easycap_sound.c
drivers/staging/easycap/easycap_testcard.c drivers/staging/media/easycap/easycap_testcard.c
drivers/staging/go7007/Kconfig drivers/staging/media/go7007/Kconfig
drivers/staging/go7007/Makefile drivers/staging/media/go7007/Makefile
drivers/staging/go7007/README drivers/staging/media/go7007/README
drivers/staging/go7007/go7007-driver.c drivers/staging/media/go7007/go7007-driver.c
drivers/staging/go7007/go7007-fw.c drivers/staging/media/go7007/go7007-fw.c
drivers/staging/go7007/go7007-i2c.c drivers/staging/media/go7007/go7007-i2c.c
drivers/staging/go7007/go7007-priv.h drivers/staging/media/go7007/go7007-priv.h
drivers/staging/go7007/go7007-usb.c drivers/staging/media/go7007/go7007-usb.c
drivers/staging/go7007/go7007-v4l2.c drivers/staging/media/go7007/go7007-v4l2.c
drivers/staging/go7007/go7007.h drivers/staging/media/go7007/go7007.h
drivers/staging/go7007/go7007.txt drivers/staging/media/go7007/go7007.txt
drivers/staging/go7007/s2250-board.c drivers/staging/media/go7007/s2250-board.c
drivers/staging/go7007/s2250-loader.c drivers/staging/media/go7007/s2250-loader.c
drivers/staging/go7007/s2250-loader.h drivers/staging/media/go7007/s2250-loader.h
drivers/staging/go7007/saa7134-go7007.c drivers/staging/media/go7007/saa7134-go7007.c
drivers/staging/go7007/snd-go7007.c drivers/staging/media/go7007/snd-go7007.c
drivers/staging/go7007/wis-i2c.h drivers/staging/media/go7007/wis-i2c.h
drivers/staging/go7007/wis-ov7640.c drivers/staging/media/go7007/wis-ov7640.c
drivers/staging/go7007/wis-saa7113.c drivers/staging/media/go7007/wis-saa7113.c
drivers/staging/go7007/wis-saa7115.c drivers/staging/media/go7007/wis-saa7115.c
drivers/staging/go7007/wis-sony-tuner.c drivers/staging/media/go7007/wis-sony-tuner.c
drivers/staging/go7007/wis-tw2804.c drivers/staging/media/go7007/wis-tw2804.c
drivers/staging/go7007/wis-tw9903.c drivers/staging/media/go7007/wis-tw9903.c
drivers/staging/go7007/wis-uda1342.c drivers/staging/media/go7007/wis-uda1342.c
drivers/staging/lirc/Kconfig drivers/staging/media/lirc/Kconfig
drivers/staging/lirc/Makefile drivers/staging/media/lirc/Makefile
drivers/staging/lirc/TODO drivers/staging/media/lirc/TODO
drivers/staging/lirc/TODO.lirc_zilog drivers/staging/media/lirc/TODO.lirc_zilog
drivers/staging/lirc/lirc_bt829.c drivers/staging/media/lirc/lirc_bt829.c
drivers/staging/lirc/lirc_ene0100.h drivers/staging/media/lirc/lirc_ene0100.h
drivers/staging/lirc/lirc_igorplugusb.c drivers/staging/media/lirc/lirc_igorplugusb.c
drivers/staging/lirc/lirc_imon.c drivers/staging/media/lirc/lirc_imon.c
drivers/staging/lirc/lirc_parallel.c drivers/staging/media/lirc/lirc_parallel.c
drivers/staging/lirc/lirc_parallel.h drivers/staging/media/lirc/lirc_parallel.h
drivers/staging/lirc/lirc_sasem.c drivers/staging/media/lirc/lirc_sasem.c
drivers/staging/lirc/lirc_serial.c drivers/staging/media/lirc/lirc_serial.c
drivers/staging/lirc/lirc_sir.c drivers/staging/media/lirc/lirc_sir.c
drivers/staging/lirc/lirc_ttusbir.c drivers/staging/media/lirc/lirc_ttusbir.c
drivers/staging/lirc/lirc_zilog.c drivers/staging/media/lirc/lirc_zilog.c
+37
drivers/staging/media/Kconfig
··· 1 + menuconfig STAGING_MEDIA 2 + bool "Media staging drivers" 3 + default n 4 + ---help--- 5 + This option allows you to select a number of media drivers that 6 + don't have the "normal" Linux kernel quality level. 7 + Most of them don't follow properly the V4L, DVB and/or RC API's, 8 + so, they won't likely work fine with the existing applications. 9 + That also means that, one fixed, their API's will change to match 10 + the existing ones. 11 + 12 + If you wish to work on these drivers, to help improve them, or 13 + to report problems you have with them, please use the 14 + linux-media@vger.kernel.org mailing list. 15 + 16 + If in doubt, say N here. 17 + 18 + 19 + if STAGING_MEDIA 20 + 21 + # Please keep them in alphabetic order 22 + source "drivers/staging/media/as102/Kconfig" 23 + 24 + source "drivers/staging/media/cxd2099/Kconfig" 25 + 26 + source "drivers/staging/media/dt3155v4l/Kconfig" 27 + 28 + source "drivers/staging/media/easycap/Kconfig" 29 + 30 + source "drivers/staging/media/go7007/Kconfig" 31 + 32 + source "drivers/staging/media/solo6x10/Kconfig" 33 + 34 + # Keep LIRC at the end, as it has sub-menus 35 + source "drivers/staging/media/lirc/Kconfig" 36 + 37 + endif
+7
drivers/staging/media/Makefile
··· 1 + obj-$(CONFIG_DVB_AS102) += as102/ 2 + obj-$(CONFIG_DVB_CXD2099) += cxd2099/ 3 + obj-$(CONFIG_EASYCAP) += easycap/ 4 + obj-$(CONFIG_LIRC_STAGING) += lirc/ 5 + obj-$(CONFIG_SOLO6X10) += solo6x10/ 6 + obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ 7 + obj-$(CONFIG_VIDEO_GO7007) += go7007/
drivers/staging/solo6x10/Kconfig drivers/staging/media/solo6x10/Kconfig
drivers/staging/solo6x10/Makefile drivers/staging/media/solo6x10/Makefile
drivers/staging/solo6x10/TODO drivers/staging/media/solo6x10/TODO
drivers/staging/solo6x10/core.c drivers/staging/media/solo6x10/core.c
drivers/staging/solo6x10/disp.c drivers/staging/media/solo6x10/disp.c
drivers/staging/solo6x10/enc.c drivers/staging/media/solo6x10/enc.c
drivers/staging/solo6x10/g723.c drivers/staging/media/solo6x10/g723.c
drivers/staging/solo6x10/gpio.c drivers/staging/media/solo6x10/gpio.c
drivers/staging/solo6x10/i2c.c drivers/staging/media/solo6x10/i2c.c
drivers/staging/solo6x10/jpeg.h drivers/staging/media/solo6x10/jpeg.h
drivers/staging/solo6x10/offsets.h drivers/staging/media/solo6x10/offsets.h
drivers/staging/solo6x10/osd-font.h drivers/staging/media/solo6x10/osd-font.h
drivers/staging/solo6x10/p2m.c drivers/staging/media/solo6x10/p2m.c
drivers/staging/solo6x10/registers.h drivers/staging/media/solo6x10/registers.h
drivers/staging/solo6x10/solo6x10.h drivers/staging/media/solo6x10/solo6x10.h
drivers/staging/solo6x10/tw28.c drivers/staging/media/solo6x10/tw28.c
drivers/staging/solo6x10/tw28.h drivers/staging/media/solo6x10/tw28.h
drivers/staging/solo6x10/v4l2-enc.c drivers/staging/media/solo6x10/v4l2-enc.c
drivers/staging/solo6x10/v4l2.c drivers/staging/media/solo6x10/v4l2.c