Permalink
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: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information...
Mauro Carvalho Chehab
Mauro Carvalho Chehab committed Nov 2, 2011
1 parent d6ce55d commit 4860c73804c6e7ef8e69f98958489bb2bea6f6d2
Showing with 48 additions and 22 deletions.
  1. +1 −1 drivers/media/dvb/ddbridge/Makefile
  2. +1 −1 drivers/media/dvb/ngene/Makefile
  3. +1 −13 drivers/staging/Kconfig
  4. +1 −7 drivers/staging/Makefile
  5. +37 −0 drivers/staging/media/Kconfig
  6. +7 −0 drivers/staging/media/Makefile
  7. 0 drivers/staging/{ → media}/cxd2099/Kconfig
  8. 0 drivers/staging/{ → media}/cxd2099/Makefile
  9. 0 drivers/staging/{ → media}/cxd2099/TODO
  10. 0 drivers/staging/{ → media}/cxd2099/cxd2099.c
  11. 0 drivers/staging/{ → media}/cxd2099/cxd2099.h
  12. 0 drivers/staging/{ → media}/dt3155v4l/Kconfig
  13. 0 drivers/staging/{ → media}/dt3155v4l/Makefile
  14. 0 drivers/staging/{ → media}/dt3155v4l/dt3155v4l.c
  15. 0 drivers/staging/{ → media}/dt3155v4l/dt3155v4l.h
  16. 0 drivers/staging/{ → media}/easycap/Kconfig
  17. 0 drivers/staging/{ → media}/easycap/Makefile
  18. 0 drivers/staging/{ → media}/easycap/README
  19. 0 drivers/staging/{ → media}/easycap/easycap.h
  20. 0 drivers/staging/{ → media}/easycap/easycap_ioctl.c
  21. 0 drivers/staging/{ → media}/easycap/easycap_low.c
  22. 0 drivers/staging/{ → media}/easycap/easycap_main.c
  23. 0 drivers/staging/{ → media}/easycap/easycap_settings.c
  24. 0 drivers/staging/{ → media}/easycap/easycap_sound.c
  25. 0 drivers/staging/{ → media}/easycap/easycap_testcard.c
  26. 0 drivers/staging/{ → media}/go7007/Kconfig
  27. 0 drivers/staging/{ → media}/go7007/Makefile
  28. 0 drivers/staging/{ → media}/go7007/README
  29. 0 drivers/staging/{ → media}/go7007/go7007-driver.c
  30. 0 drivers/staging/{ → media}/go7007/go7007-fw.c
  31. 0 drivers/staging/{ → media}/go7007/go7007-i2c.c
  32. 0 drivers/staging/{ → media}/go7007/go7007-priv.h
  33. 0 drivers/staging/{ → media}/go7007/go7007-usb.c
  34. 0 drivers/staging/{ → media}/go7007/go7007-v4l2.c
  35. 0 drivers/staging/{ → media}/go7007/go7007.h
  36. 0 drivers/staging/{ → media}/go7007/go7007.txt
  37. 0 drivers/staging/{ → media}/go7007/s2250-board.c
  38. 0 drivers/staging/{ → media}/go7007/s2250-loader.c
  39. 0 drivers/staging/{ → media}/go7007/s2250-loader.h
  40. 0 drivers/staging/{ → media}/go7007/saa7134-go7007.c
  41. 0 drivers/staging/{ → media}/go7007/snd-go7007.c
  42. 0 drivers/staging/{ → media}/go7007/wis-i2c.h
  43. 0 drivers/staging/{ → media}/go7007/wis-ov7640.c
  44. 0 drivers/staging/{ → media}/go7007/wis-saa7113.c
  45. 0 drivers/staging/{ → media}/go7007/wis-saa7115.c
  46. 0 drivers/staging/{ → media}/go7007/wis-sony-tuner.c
  47. 0 drivers/staging/{ → media}/go7007/wis-tw2804.c
  48. 0 drivers/staging/{ → media}/go7007/wis-tw9903.c
  49. 0 drivers/staging/{ → media}/go7007/wis-uda1342.c
  50. 0 drivers/staging/{ → media}/lirc/Kconfig
  51. 0 drivers/staging/{ → media}/lirc/Makefile
  52. 0 drivers/staging/{ → media}/lirc/TODO
  53. 0 drivers/staging/{ → media}/lirc/TODO.lirc_zilog
  54. 0 drivers/staging/{ → media}/lirc/lirc_bt829.c
  55. 0 drivers/staging/{ → media}/lirc/lirc_ene0100.h
  56. 0 drivers/staging/{ → media}/lirc/lirc_igorplugusb.c
  57. 0 drivers/staging/{ → media}/lirc/lirc_imon.c
  58. 0 drivers/staging/{ → media}/lirc/lirc_parallel.c
  59. 0 drivers/staging/{ → media}/lirc/lirc_parallel.h
  60. 0 drivers/staging/{ → media}/lirc/lirc_sasem.c
  61. 0 drivers/staging/{ → media}/lirc/lirc_serial.c
  62. 0 drivers/staging/{ → media}/lirc/lirc_sir.c
  63. 0 drivers/staging/{ → media}/lirc/lirc_ttusbir.c
  64. 0 drivers/staging/{ → media}/lirc/lirc_zilog.c
  65. 0 drivers/staging/{ → media}/solo6x10/Kconfig
  66. 0 drivers/staging/{ → media}/solo6x10/Makefile
  67. 0 drivers/staging/{ → media}/solo6x10/TODO
  68. 0 drivers/staging/{ → media}/solo6x10/core.c
  69. 0 drivers/staging/{ → media}/solo6x10/disp.c
  70. 0 drivers/staging/{ → media}/solo6x10/enc.c
  71. 0 drivers/staging/{ → media}/solo6x10/g723.c
  72. 0 drivers/staging/{ → media}/solo6x10/gpio.c
  73. 0 drivers/staging/{ → media}/solo6x10/i2c.c
  74. 0 drivers/staging/{ → media}/solo6x10/jpeg.h
  75. 0 drivers/staging/{ → media}/solo6x10/offsets.h
  76. 0 drivers/staging/{ → media}/solo6x10/osd-font.h
  77. 0 drivers/staging/{ → media}/solo6x10/p2m.c
  78. 0 drivers/staging/{ → media}/solo6x10/registers.h
  79. 0 drivers/staging/{ → media}/solo6x10/solo6x10.h
  80. 0 drivers/staging/{ → media}/solo6x10/tw28.c
  81. 0 drivers/staging/{ → media}/solo6x10/tw28.h
  82. 0 drivers/staging/{ → media}/solo6x10/v4l2-enc.c
  83. 0 drivers/staging/{ → media}/solo6x10/v4l2.c
@@ -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/
@@ -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/
View
@@ -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
View
@@ -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/
@@ -0,0 +1,37 @@
+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
@@ -0,0 +1,7 @@
+obj-$(CONFIG_DVB_AS102) += as102/
+obj-$(CONFIG_DVB_CXD2099) += cxd2099/
+obj-$(CONFIG_EASYCAP) += easycap/
+obj-$(CONFIG_LIRC_STAGING) += lirc/
+obj-$(CONFIG_SOLO6X10) += solo6x10/
+obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
+obj-$(CONFIG_VIDEO_GO7007) += go7007/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 4860c73

Please sign in to comment.