Commit 4860c738 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d6ce55de

drivers/media/dvb/ddbridge/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/ 
ccflags-y += -Idrivers/media/common/tuners/



# For the staging CI driver cxd2099

ccflags-y += -Idrivers/staging/cxd2099/
 
ccflags-y += -Idrivers/staging/media/cxd2099/

drivers/media/dvb/ngene/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/ 
ccflags-y += -Idrivers/media/common/tuners/



# For the staging CI driver cxd2099

ccflags-y += -Idrivers/staging/cxd2099/
 
ccflags-y += -Idrivers/staging/media/cxd2099/

drivers/staging/Kconfig

+1 −13
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ source "drivers/staging/et131x/Kconfig" 


source "drivers/staging/slicoss/Kconfig"



source "drivers/staging/go7007/Kconfig"



source "drivers/staging/cxd2099/Kconfig"



source "drivers/staging/usbip/Kconfig"



source "drivers/staging/winbond/Kconfig"
@@ -102,20 +98,12 @@ source "drivers/staging/wlags49_h25/Kconfig" 


source "drivers/staging/sm7xx/Kconfig"



source "drivers/staging/dt3155v4l/Kconfig"



source "drivers/staging/crystalhd/Kconfig"



source "drivers/staging/cxt1e1/Kconfig"



source "drivers/staging/xgifb/Kconfig"



source "drivers/staging/lirc/Kconfig"



source "drivers/staging/easycap/Kconfig"



source "drivers/staging/solo6x10/Kconfig"



source "drivers/staging/tidspbridge/Kconfig"



source "drivers/staging/quickstart/Kconfig"
@@ -142,6 +130,6 @@ source "drivers/staging/mei/Kconfig" 


source "drivers/staging/nvec/Kconfig"



source "drivers/staging/media/as102/Kconfig"

source "drivers/staging/media/Kconfig"



endif # STAGING

drivers/staging/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -4,11 +4,9 @@ 
obj-$(CONFIG_STAGING)		+= staging.o



obj-y				+= serial/

obj-y				+= media/

obj-$(CONFIG_ET131X)		+= et131x/

obj-$(CONFIG_SLICOSS)		+= slicoss/

obj-$(CONFIG_VIDEO_GO7007)	+= go7007/

obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/

obj-$(CONFIG_LIRC_STAGING)	+= lirc/

obj-$(CONFIG_USBIP_CORE)	+= usbip/

obj-$(CONFIG_W35UND)		+= winbond/

obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
@@ -43,12 +41,9 @@ obj-$(CONFIG_ZCACHE) += zcache/ 
obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/

obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/

obj-$(CONFIG_FB_SM7XX)		+= sm7xx/

obj-$(CONFIG_VIDEO_DT3155)	+= dt3155v4l/

obj-$(CONFIG_CRYSTALHD)		+= crystalhd/

obj-$(CONFIG_CXT1E1)		+= cxt1e1/

obj-$(CONFIG_FB_XGI)		+= xgifb/

obj-$(CONFIG_EASYCAP)		+= easycap/

obj-$(CONFIG_SOLO6X10)		+= solo6x10/

obj-$(CONFIG_TIDSPBRIDGE)	+= tidspbridge/

obj-$(CONFIG_ACPI_QUICKSTART)	+= quickstart/

obj-$(CONFIG_SBE_2T3E3)		+= sbe-2t3e3/
@@ -62,4 +57,3 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ 
obj-$(CONFIG_DRM_PSB)		+= gma500/

obj-$(CONFIG_INTEL_MEI)		+= mei/

obj-$(CONFIG_MFD_NVEC)		+= nvec/
 
obj-$(CONFIG_DVB_AS102)		+= media/as102/

drivers/staging/media/Kconfig

0 → 100644
+37 −0
Original line number Diff line number Diff line 
menuconfig STAGING_MEDIA

        bool "Media staging drivers"

        default n

        ---help---

          This option allows you to select a number of media drivers that

	  don't have the "normal" Linux kernel quality level.

	  Most of them don't follow properly the V4L, DVB and/or RC API's,

	  so, they won't likely work fine with the existing applications.

	  That also means that, one fixed, their API's will change to match

	  the existing ones.



          If you wish to work on these drivers, to help improve them, or

          to report problems you have with them, please use the

	  linux-media@vger.kernel.org mailing list.



          If in doubt, say N here.





if STAGING_MEDIA



# Please keep them in alphabetic order

source "drivers/staging/media/as102/Kconfig"



source "drivers/staging/media/cxd2099/Kconfig"



source "drivers/staging/media/dt3155v4l/Kconfig"



source "drivers/staging/media/easycap/Kconfig"



source "drivers/staging/media/go7007/Kconfig"



source "drivers/staging/media/solo6x10/Kconfig"



# Keep LIRC at the end, as it has sub-menus

source "drivers/staging/media/lirc/Kconfig"



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE