Skip to contentSkip to conversation

move cx25821 out of staging

PATCH New Mauro Carvalho Chehab 1 participant 3 messages Nov 2, 2011 1 message not in the archive

Subsystems (2)
Media (V4L/DVB) Staging
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mauro Carvalho Chehab

author
#1 lore raw

PATCH 1/3 move cx25821 out of staging

This driver had the major issues already fixed. Move it out of staging.

Signed-off-by Mauro Carvalho Chehab <[email protected]>
 rename drivers/{staging => media/video}/cx25821/Kconfig (100%)
 rename drivers/{staging => media/video}/cx25821/Makefile (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-alsa.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-audio-upstream.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-audio-upstream.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-audio.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-biffuncs.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-cards.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-core.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-gpio.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-i2c.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-medusa-defines.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-medusa-reg.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-medusa-video.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-medusa-video.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-reg.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-sram.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream-ch2.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream-ch2.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-video-upstream.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-video.c (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821-video.h (100%)
 rename drivers/{staging => media/video}/cx25821/cx25821.h (100%)
 delete mode 100644 drivers/staging/cx25821/README
drivers/media/video/Kconfig +2 -0
index b80bea2..81ac09a 100644
@@ -736,6 +736,8 @@ source "drivers/media/video/cx88/Kconfig"
 
 source "drivers/media/video/cx23885/Kconfig"
 
+source "drivers/media/video/cx25821/Kconfig"
+
 source "drivers/media/video/au0828/Kconfig"
 
 source "drivers/media/video/ivtv/Kconfig"
drivers/media/video/Makefile +1 -0
index 11fff97..faba1e3 100644
@@ -104,6 +104,7 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/
 obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
+obj-$(CONFIG_VIDEO_CX25821) += cx25821/
 obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
drivers/media/video/cx25821/Kconfig renamed from drivers/staging/cx25821/Kconfig +0 -0
similarity index 100%
rename from drivers/staging/cx25821/Kconfig
rename to drivers/media/video/cx25821/Kconfig
drivers/media/video/cx25821/Makefile renamed from drivers/staging/cx25821/Makefile +0 -0
similarity index 100%
rename from drivers/staging/cx25821/Makefile
rename to drivers/media/video/cx25821/Makefile
drivers/media/video/cx25821/cx25821-alsa.c renamed from drivers/staging/cx25821/cx25821-alsa.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-alsa.c
rename to drivers/media/video/cx25821/cx25821-alsa.c
drivers/media/video/cx25821/cx25821-audio-upstream.c renamed from drivers/staging/cx25821/cx25821-audio-upstream.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-audio-upstream.c
rename to drivers/media/video/cx25821/cx25821-audio-upstream.c
drivers/media/video/cx25821/cx25821-audio-upstream.h renamed from drivers/staging/cx25821/cx25821-audio-upstream.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-audio-upstream.h
rename to drivers/media/video/cx25821/cx25821-audio-upstream.h
drivers/media/video/cx25821/cx25821-audio.h renamed from drivers/staging/cx25821/cx25821-audio.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-audio.h
rename to drivers/media/video/cx25821/cx25821-audio.h
drivers/media/video/cx25821/cx25821-biffuncs.h renamed from drivers/staging/cx25821/cx25821-biffuncs.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-biffuncs.h
rename to drivers/media/video/cx25821/cx25821-biffuncs.h
drivers/media/video/cx25821/cx25821-cards.c renamed from drivers/staging/cx25821/cx25821-cards.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-cards.c
rename to drivers/media/video/cx25821/cx25821-cards.c
drivers/media/video/cx25821/cx25821-core.c renamed from drivers/staging/cx25821/cx25821-core.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-core.c
rename to drivers/media/video/cx25821/cx25821-core.c
drivers/media/video/cx25821/cx25821-gpio.c renamed from drivers/staging/cx25821/cx25821-gpio.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-gpio.c
rename to drivers/media/video/cx25821/cx25821-gpio.c
drivers/media/video/cx25821/cx25821-i2c.c renamed from drivers/staging/cx25821/cx25821-i2c.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-i2c.c
rename to drivers/media/video/cx25821/cx25821-i2c.c
drivers/media/video/cx25821/cx25821-medusa-defines.h renamed from drivers/staging/cx25821/cx25821-medusa-defines.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-medusa-defines.h
rename to drivers/media/video/cx25821/cx25821-medusa-defines.h
drivers/media/video/cx25821/cx25821-medusa-reg.h renamed from drivers/staging/cx25821/cx25821-medusa-reg.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-medusa-reg.h
rename to drivers/media/video/cx25821/cx25821-medusa-reg.h
drivers/media/video/cx25821/cx25821-medusa-video.c renamed from drivers/staging/cx25821/cx25821-medusa-video.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-medusa-video.c
rename to drivers/media/video/cx25821/cx25821-medusa-video.c
drivers/media/video/cx25821/cx25821-medusa-video.h renamed from drivers/staging/cx25821/cx25821-medusa-video.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-medusa-video.h
rename to drivers/media/video/cx25821/cx25821-medusa-video.h
drivers/media/video/cx25821/cx25821-reg.h renamed from drivers/staging/cx25821/cx25821-reg.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-reg.h
rename to drivers/media/video/cx25821/cx25821-reg.h
drivers/media/video/cx25821/cx25821-sram.h renamed from drivers/staging/cx25821/cx25821-sram.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-sram.h
rename to drivers/media/video/cx25821/cx25821-sram.h
drivers/media/video/cx25821/cx25821-video-upstream-ch2.c renamed from drivers/staging/cx25821/cx25821-video-upstream-ch2.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-video-upstream-ch2.c
rename to drivers/media/video/cx25821/cx25821-video-upstream-ch2.c
drivers/media/video/cx25821/cx25821-video-upstream-ch2.h renamed from drivers/staging/cx25821/cx25821-video-upstream-ch2.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-video-upstream-ch2.h
rename to drivers/media/video/cx25821/cx25821-video-upstream-ch2.h
drivers/media/video/cx25821/cx25821-video-upstream.c renamed from drivers/staging/cx25821/cx25821-video-upstream.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-video-upstream.c
rename to drivers/media/video/cx25821/cx25821-video-upstream.c
drivers/media/video/cx25821/cx25821-video-upstream.h renamed from drivers/staging/cx25821/cx25821-video-upstream.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-video-upstream.h
rename to drivers/media/video/cx25821/cx25821-video-upstream.h
drivers/media/video/cx25821/cx25821-video.c renamed from drivers/staging/cx25821/cx25821-video.c +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-video.c
rename to drivers/media/video/cx25821/cx25821-video.c
drivers/media/video/cx25821/cx25821-video.h renamed from drivers/staging/cx25821/cx25821-video.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821-video.h
rename to drivers/media/video/cx25821/cx25821-video.h
drivers/media/video/cx25821/cx25821.h renamed from drivers/staging/cx25821/cx25821.h +0 -0
similarity index 100%
rename from drivers/staging/cx25821/cx25821.h
rename to drivers/media/video/cx25821/cx25821.h
drivers/staging/Kconfig +0 -2
index 0cd26b8..280da2f 100644
@@ -30,8 +30,6 @@ source "drivers/staging/slicoss/Kconfig"
 
 source "drivers/staging/go7007/Kconfig"
 
-source "drivers/staging/cx25821/Kconfig"
-
 source "drivers/staging/cxd2099/Kconfig"
 
 source "drivers/staging/usbip/Kconfig"
drivers/staging/Makefile +0 -1
index 583facc..e66ab00 100644
@@ -6,7 +6,6 @@ obj-$(CONFIG_STAGING)		+= staging.o
 obj-$(CONFIG_ET131X)		+= et131x/
 obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
-obj-$(CONFIG_VIDEO_CX25821)	+= cx25821/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_LIRC_STAGING)	+= lirc/
 obj-$(CONFIG_USBIP_CORE)	+= usbip/
drivers/staging/cx25821/README deleted +0 -6
deleted file mode 100644
index a9ba50b..0000000
@@ -1,6 +0,0 @@
-Todo:
-	- checkpatch.pl cleanups
-	- sparse cleanups
-
-Please send patches to [email protected]
-
Signature · 1 line
1.7.6.4
author
#2 lore raw

PATCH 2/3 staging: Move media drivers to staging/media

In reply to a message not in the archive

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.

Signed-off-by Mauro Carvalho Chehab <[email protected]>
 create mode 100644 drivers/staging/media/Kconfig
 create mode 100644 drivers/staging/media/Makefile
 rename drivers/staging/{ => media}/cxd2099/Kconfig (100%)
 rename drivers/staging/{ => media}/cxd2099/Makefile (100%)
 rename drivers/staging/{ => media}/cxd2099/TODO (100%)
 rename drivers/staging/{ => media}/cxd2099/cxd2099.c (100%)
 rename drivers/staging/{ => media}/cxd2099/cxd2099.h (100%)
 rename drivers/staging/{ => media}/dt3155v4l/Kconfig (100%)
 rename drivers/staging/{ => media}/dt3155v4l/Makefile (100%)
 rename drivers/staging/{ => media}/dt3155v4l/dt3155v4l.c (100%)
 rename drivers/staging/{ => media}/dt3155v4l/dt3155v4l.h (100%)
 rename drivers/staging/{ => media}/easycap/Kconfig (100%)
 rename drivers/staging/{ => media}/easycap/Makefile (100%)
 rename drivers/staging/{ => media}/easycap/README (100%)
 rename drivers/staging/{ => media}/easycap/easycap.h (100%)
 rename drivers/staging/{ => media}/easycap/easycap_ioctl.c (100%)
 rename drivers/staging/{ => media}/easycap/easycap_low.c (100%)
 rename drivers/staging/{ => media}/easycap/easycap_main.c (100%)
 rename drivers/staging/{ => media}/easycap/easycap_settings.c (100%)
 rename drivers/staging/{ => media}/easycap/easycap_sound.c (100%)
 rename drivers/staging/{ => media}/easycap/easycap_testcard.c (100%)
 rename drivers/staging/{ => media}/go7007/Kconfig (100%)
 rename drivers/staging/{ => media}/go7007/Makefile (100%)
 rename drivers/staging/{ => media}/go7007/README (100%)
 rename drivers/staging/{ => media}/go7007/go7007-driver.c (100%)
 rename drivers/staging/{ => media}/go7007/go7007-fw.c (100%)
 rename drivers/staging/{ => media}/go7007/go7007-i2c.c (100%)
 rename drivers/staging/{ => media}/go7007/go7007-priv.h (100%)
 rename drivers/staging/{ => media}/go7007/go7007-usb.c (100%)
 rename drivers/staging/{ => media}/go7007/go7007-v4l2.c (100%)
 rename drivers/staging/{ => media}/go7007/go7007.h (100%)
 rename drivers/staging/{ => media}/go7007/go7007.txt (100%)
 rename drivers/staging/{ => media}/go7007/s2250-board.c (100%)
 rename drivers/staging/{ => media}/go7007/s2250-loader.c (100%)
 rename drivers/staging/{ => media}/go7007/s2250-loader.h (100%)
 rename drivers/staging/{ => media}/go7007/saa7134-go7007.c (100%)
 rename drivers/staging/{ => media}/go7007/snd-go7007.c (100%)
 rename drivers/staging/{ => media}/go7007/wis-i2c.h (100%)
 rename drivers/staging/{ => media}/go7007/wis-ov7640.c (100%)
 rename drivers/staging/{ => media}/go7007/wis-saa7113.c (100%)
 rename drivers/staging/{ => media}/go7007/wis-saa7115.c (100%)
 rename drivers/staging/{ => media}/go7007/wis-sony-tuner.c (100%)
 rename drivers/staging/{ => media}/go7007/wis-tw2804.c (100%)
 rename drivers/staging/{ => media}/go7007/wis-tw9903.c (100%)
 rename drivers/staging/{ => media}/go7007/wis-uda1342.c (100%)
 rename drivers/staging/{ => media}/lirc/Kconfig (100%)
 rename drivers/staging/{ => media}/lirc/Makefile (100%)
 rename drivers/staging/{ => media}/lirc/TODO (100%)
 rename drivers/staging/{ => media}/lirc/TODO.lirc_zilog (100%)
 rename drivers/staging/{ => media}/lirc/lirc_bt829.c (100%)
 rename drivers/staging/{ => media}/lirc/lirc_ene0100.h (100%)
 rename drivers/staging/{ => media}/lirc/lirc_igorplugusb.c (100%)
 rename drivers/staging/{ => media}/lirc/lirc_imon.c (100%)
 rename drivers/staging/{ => media}/lirc/lirc_parallel.c (100%)
 rename drivers/staging/{ => media}/lirc/lirc_parallel.h (100%)
 rename drivers/staging/{ => media}/lirc/lirc_sasem.c (100%)
 rename drivers/staging/{ => media}/lirc/lirc_serial.c (100%)
 rename drivers/staging/{ => media}/lirc/lirc_sir.c (100%)
 rename drivers/staging/{ => media}/lirc/lirc_ttusbir.c (100%)
 rename drivers/staging/{ => media}/lirc/lirc_zilog.c (100%)
 rename drivers/staging/{ => media}/solo6x10/Kconfig (100%)
 rename drivers/staging/{ => media}/solo6x10/Makefile (100%)
 rename drivers/staging/{ => media}/solo6x10/TODO (100%)
 rename drivers/staging/{ => media}/solo6x10/core.c (100%)
 rename drivers/staging/{ => media}/solo6x10/disp.c (100%)
 rename drivers/staging/{ => media}/solo6x10/enc.c (100%)
 rename drivers/staging/{ => media}/solo6x10/g723.c (100%)
 rename drivers/staging/{ => media}/solo6x10/gpio.c (100%)
 rename drivers/staging/{ => media}/solo6x10/i2c.c (100%)
 rename drivers/staging/{ => media}/solo6x10/jpeg.h (100%)
 rename drivers/staging/{ => media}/solo6x10/offsets.h (100%)
 rename drivers/staging/{ => media}/solo6x10/osd-font.h (100%)
 rename drivers/staging/{ => media}/solo6x10/p2m.c (100%)
 rename drivers/staging/{ => media}/solo6x10/registers.h (100%)
 rename drivers/staging/{ => media}/solo6x10/solo6x10.h (100%)
 rename drivers/staging/{ => media}/solo6x10/tw28.c (100%)
 rename drivers/staging/{ => media}/solo6x10/tw28.h (100%)
 rename drivers/staging/{ => media}/solo6x10/v4l2-enc.c (100%)
 rename drivers/staging/{ => media}/solo6x10/v4l2.c (100%)
drivers/media/dvb/ddbridge/Makefile +1 -1
index cf7214e..38019ba 100644
@@ -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
index 8987361..13ebeff 100644
@@ -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
index 280da2f..2a99cba 100644
@@ -28,10 +28,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"

@@ -144,6 +132,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 -6
index e66ab00..cf92bc1 100644
@@ -3,11 +3,9 @@
 # fix for build system bug...
 obj-$(CONFIG_STAGING)		+= staging.o
 
+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/
drivers/staging/media/Kconfig new file +37 -0
new file mode 100644
index 0000000..7e5caa3
@@ -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
+	  [email protected] 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
drivers/staging/media/Makefile new file +7 -0
new file mode 100644
index 0000000..c69124c
@@ -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/
drivers/staging/media/cxd2099/Kconfig renamed from drivers/staging/cxd2099/Kconfig +0 -0
similarity index 100%
rename from drivers/staging/cxd2099/Kconfig
rename to drivers/staging/media/cxd2099/Kconfig
drivers/staging/media/cxd2099/Makefile renamed from drivers/staging/cxd2099/Makefile +0 -0
similarity index 100%
rename from drivers/staging/cxd2099/Makefile
rename to drivers/staging/media/cxd2099/Makefile
drivers/staging/media/cxd2099/TODO renamed from drivers/staging/cxd2099/TODO +0 -0
similarity index 100%
rename from drivers/staging/cxd2099/TODO
rename to drivers/staging/media/cxd2099/TODO
drivers/staging/media/cxd2099/cxd2099.c renamed from drivers/staging/cxd2099/cxd2099.c +0 -0
similarity index 100%
rename from drivers/staging/cxd2099/cxd2099.c
rename to drivers/staging/media/cxd2099/cxd2099.c
drivers/staging/media/cxd2099/cxd2099.h renamed from drivers/staging/cxd2099/cxd2099.h +0 -0
similarity index 100%
rename from drivers/staging/cxd2099/cxd2099.h
rename to drivers/staging/media/cxd2099/cxd2099.h
drivers/staging/media/dt3155v4l/Kconfig renamed from drivers/staging/dt3155v4l/Kconfig +0 -0
similarity index 100%
rename from drivers/staging/dt3155v4l/Kconfig
rename to drivers/staging/media/dt3155v4l/Kconfig
drivers/staging/media/dt3155v4l/Makefile renamed from drivers/staging/dt3155v4l/Makefile +0 -0
similarity index 100%
rename from drivers/staging/dt3155v4l/Makefile
rename to drivers/staging/media/dt3155v4l/Makefile
drivers/staging/media/dt3155v4l/dt3155v4l.c renamed from drivers/staging/dt3155v4l/dt3155v4l.c +0 -0
similarity index 100%
rename from drivers/staging/dt3155v4l/dt3155v4l.c
rename to drivers/staging/media/dt3155v4l/dt3155v4l.c
drivers/staging/media/dt3155v4l/dt3155v4l.h renamed from drivers/staging/dt3155v4l/dt3155v4l.h +0 -0
similarity index 100%
rename from drivers/staging/dt3155v4l/dt3155v4l.h
rename to drivers/staging/media/dt3155v4l/dt3155v4l.h
drivers/staging/media/easycap/Kconfig renamed from drivers/staging/easycap/Kconfig +0 -0
similarity index 100%
rename from drivers/staging/easycap/Kconfig
rename to drivers/staging/media/easycap/Kconfig
drivers/staging/media/easycap/Makefile renamed from drivers/staging/easycap/Makefile +0 -0
similarity index 100%
rename from drivers/staging/easycap/Makefile
rename to drivers/staging/media/easycap/Makefile
drivers/staging/media/easycap/README renamed from drivers/staging/easycap/README +0 -0
similarity index 100%
rename from drivers/staging/easycap/README
rename to drivers/staging/media/easycap/README
drivers/staging/media/easycap/easycap.h renamed from drivers/staging/easycap/easycap.h +0 -0
similarity index 100%
rename from drivers/staging/easycap/easycap.h
rename to drivers/staging/media/easycap/easycap.h
drivers/staging/media/easycap/easycap_ioctl.c renamed from drivers/staging/easycap/easycap_ioctl.c +0 -0
similarity index 100%
rename from drivers/staging/easycap/easycap_ioctl.c
rename to drivers/staging/media/easycap/easycap_ioctl.c
drivers/staging/media/easycap/easycap_low.c renamed from drivers/staging/easycap/easycap_low.c +0 -0
similarity index 100%
rename from drivers/staging/easycap/easycap_low.c
rename to drivers/staging/media/easycap/easycap_low.c
drivers/staging/media/easycap/easycap_main.c renamed from drivers/staging/easycap/easycap_main.c +0 -0
similarity index 100%
rename from drivers/staging/easycap/easycap_main.c
rename to drivers/staging/media/easycap/easycap_main.c
drivers/staging/media/easycap/easycap_settings.c renamed from drivers/staging/easycap/easycap_settings.c +0 -0
similarity index 100%
rename from drivers/staging/easycap/easycap_settings.c
rename to drivers/staging/media/easycap/easycap_settings.c
drivers/staging/media/easycap/easycap_sound.c renamed from drivers/staging/easycap/easycap_sound.c +0 -0
similarity index 100%
rename from drivers/staging/easycap/easycap_sound.c
rename to drivers/staging/media/easycap/easycap_sound.c
drivers/staging/media/easycap/easycap_testcard.c renamed from drivers/staging/easycap/easycap_testcard.c +0 -0
similarity index 100%
rename from drivers/staging/easycap/easycap_testcard.c
rename to drivers/staging/media/easycap/easycap_testcard.c
drivers/staging/media/go7007/Kconfig renamed from drivers/staging/go7007/Kconfig +0 -0
similarity index 100%
rename from drivers/staging/go7007/Kconfig
rename to drivers/staging/media/go7007/Kconfig
drivers/staging/media/go7007/Makefile renamed from drivers/staging/go7007/Makefile +0 -0
similarity index 100%
rename from drivers/staging/go7007/Makefile
rename to drivers/staging/media/go7007/Makefile
drivers/staging/media/go7007/README renamed from drivers/staging/go7007/README +0 -0
similarity index 100%
rename from drivers/staging/go7007/README
rename to drivers/staging/media/go7007/README
drivers/staging/media/go7007/go7007-driver.c renamed from drivers/staging/go7007/go7007-driver.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/go7007-driver.c
rename to drivers/staging/media/go7007/go7007-driver.c
drivers/staging/media/go7007/go7007-fw.c renamed from drivers/staging/go7007/go7007-fw.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/go7007-fw.c
rename to drivers/staging/media/go7007/go7007-fw.c
drivers/staging/media/go7007/go7007-i2c.c renamed from drivers/staging/go7007/go7007-i2c.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/go7007-i2c.c
rename to drivers/staging/media/go7007/go7007-i2c.c
drivers/staging/media/go7007/go7007-priv.h renamed from drivers/staging/go7007/go7007-priv.h +0 -0
similarity index 100%
rename from drivers/staging/go7007/go7007-priv.h
rename to drivers/staging/media/go7007/go7007-priv.h
drivers/staging/media/go7007/go7007-usb.c renamed from drivers/staging/go7007/go7007-usb.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/go7007-usb.c
rename to drivers/staging/media/go7007/go7007-usb.c
drivers/staging/media/go7007/go7007-v4l2.c renamed from drivers/staging/go7007/go7007-v4l2.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/go7007-v4l2.c
rename to drivers/staging/media/go7007/go7007-v4l2.c
drivers/staging/media/go7007/go7007.h renamed from drivers/staging/go7007/go7007.h +0 -0
similarity index 100%
rename from drivers/staging/go7007/go7007.h
rename to drivers/staging/media/go7007/go7007.h
drivers/staging/media/go7007/go7007.txt renamed from drivers/staging/go7007/go7007.txt +0 -0
similarity index 100%
rename from drivers/staging/go7007/go7007.txt
rename to drivers/staging/media/go7007/go7007.txt
drivers/staging/media/go7007/s2250-board.c renamed from drivers/staging/go7007/s2250-board.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/s2250-board.c
rename to drivers/staging/media/go7007/s2250-board.c
drivers/staging/media/go7007/s2250-loader.c renamed from drivers/staging/go7007/s2250-loader.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/s2250-loader.c
rename to drivers/staging/media/go7007/s2250-loader.c
drivers/staging/media/go7007/s2250-loader.h renamed from drivers/staging/go7007/s2250-loader.h +0 -0
similarity index 100%
rename from drivers/staging/go7007/s2250-loader.h
rename to drivers/staging/media/go7007/s2250-loader.h
drivers/staging/media/go7007/saa7134-go7007.c renamed from drivers/staging/go7007/saa7134-go7007.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/saa7134-go7007.c
rename to drivers/staging/media/go7007/saa7134-go7007.c
drivers/staging/media/go7007/snd-go7007.c renamed from drivers/staging/go7007/snd-go7007.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/snd-go7007.c
rename to drivers/staging/media/go7007/snd-go7007.c
drivers/staging/media/go7007/wis-i2c.h renamed from drivers/staging/go7007/wis-i2c.h +0 -0
similarity index 100%
rename from drivers/staging/go7007/wis-i2c.h
rename to drivers/staging/media/go7007/wis-i2c.h
drivers/staging/media/go7007/wis-ov7640.c renamed from drivers/staging/go7007/wis-ov7640.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/wis-ov7640.c
rename to drivers/staging/media/go7007/wis-ov7640.c
drivers/staging/media/go7007/wis-saa7113.c renamed from drivers/staging/go7007/wis-saa7113.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/wis-saa7113.c
rename to drivers/staging/media/go7007/wis-saa7113.c
drivers/staging/media/go7007/wis-saa7115.c renamed from drivers/staging/go7007/wis-saa7115.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/wis-saa7115.c
rename to drivers/staging/media/go7007/wis-saa7115.c
drivers/staging/media/go7007/wis-sony-tuner.c renamed from drivers/staging/go7007/wis-sony-tuner.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/wis-sony-tuner.c
rename to drivers/staging/media/go7007/wis-sony-tuner.c
drivers/staging/media/go7007/wis-tw2804.c renamed from drivers/staging/go7007/wis-tw2804.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/wis-tw2804.c
rename to drivers/staging/media/go7007/wis-tw2804.c
drivers/staging/media/go7007/wis-tw9903.c renamed from drivers/staging/go7007/wis-tw9903.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/wis-tw9903.c
rename to drivers/staging/media/go7007/wis-tw9903.c
drivers/staging/media/go7007/wis-uda1342.c renamed from drivers/staging/go7007/wis-uda1342.c +0 -0
similarity index 100%
rename from drivers/staging/go7007/wis-uda1342.c
rename to drivers/staging/media/go7007/wis-uda1342.c
drivers/staging/media/lirc/Kconfig renamed from drivers/staging/lirc/Kconfig +0 -0
similarity index 100%
rename from drivers/staging/lirc/Kconfig
rename to drivers/staging/media/lirc/Kconfig
drivers/staging/media/lirc/Makefile renamed from drivers/staging/lirc/Makefile +0 -0
similarity index 100%
rename from drivers/staging/lirc/Makefile
rename to drivers/staging/media/lirc/Makefile
drivers/staging/media/lirc/TODO renamed from drivers/staging/lirc/TODO +0 -0
similarity index 100%
rename from drivers/staging/lirc/TODO
rename to drivers/staging/media/lirc/TODO
drivers/staging/media/lirc/TODO.lirc_zilog renamed from drivers/staging/lirc/TODO.lirc_zilog +0 -0
similarity index 100%
rename from drivers/staging/lirc/TODO.lirc_zilog
rename to drivers/staging/media/lirc/TODO.lirc_zilog
drivers/staging/media/lirc/lirc_bt829.c renamed from drivers/staging/lirc/lirc_bt829.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_bt829.c
rename to drivers/staging/media/lirc/lirc_bt829.c
drivers/staging/media/lirc/lirc_ene0100.h renamed from drivers/staging/lirc/lirc_ene0100.h +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_ene0100.h
rename to drivers/staging/media/lirc/lirc_ene0100.h
drivers/staging/media/lirc/lirc_igorplugusb.c renamed from drivers/staging/lirc/lirc_igorplugusb.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_igorplugusb.c
rename to drivers/staging/media/lirc/lirc_igorplugusb.c
drivers/staging/media/lirc/lirc_imon.c renamed from drivers/staging/lirc/lirc_imon.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_imon.c
rename to drivers/staging/media/lirc/lirc_imon.c
drivers/staging/media/lirc/lirc_parallel.c renamed from drivers/staging/lirc/lirc_parallel.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_parallel.c
rename to drivers/staging/media/lirc/lirc_parallel.c
drivers/staging/media/lirc/lirc_parallel.h renamed from drivers/staging/lirc/lirc_parallel.h +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_parallel.h
rename to drivers/staging/media/lirc/lirc_parallel.h
drivers/staging/media/lirc/lirc_sasem.c renamed from drivers/staging/lirc/lirc_sasem.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_sasem.c
rename to drivers/staging/media/lirc/lirc_sasem.c
drivers/staging/media/lirc/lirc_serial.c renamed from drivers/staging/lirc/lirc_serial.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_serial.c
rename to drivers/staging/media/lirc/lirc_serial.c
drivers/staging/media/lirc/lirc_sir.c renamed from drivers/staging/lirc/lirc_sir.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_sir.c
rename to drivers/staging/media/lirc/lirc_sir.c
drivers/staging/media/lirc/lirc_ttusbir.c renamed from drivers/staging/lirc/lirc_ttusbir.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_ttusbir.c
rename to drivers/staging/media/lirc/lirc_ttusbir.c
drivers/staging/media/lirc/lirc_zilog.c renamed from drivers/staging/lirc/lirc_zilog.c +0 -0
similarity index 100%
rename from drivers/staging/lirc/lirc_zilog.c
rename to drivers/staging/media/lirc/lirc_zilog.c
drivers/staging/media/solo6x10/Kconfig renamed from drivers/staging/solo6x10/Kconfig +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/Kconfig
rename to drivers/staging/media/solo6x10/Kconfig
drivers/staging/media/solo6x10/Makefile renamed from drivers/staging/solo6x10/Makefile +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/Makefile
rename to drivers/staging/media/solo6x10/Makefile
drivers/staging/media/solo6x10/TODO renamed from drivers/staging/solo6x10/TODO +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/TODO
rename to drivers/staging/media/solo6x10/TODO
drivers/staging/media/solo6x10/core.c renamed from drivers/staging/solo6x10/core.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/core.c
rename to drivers/staging/media/solo6x10/core.c
drivers/staging/media/solo6x10/disp.c renamed from drivers/staging/solo6x10/disp.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/disp.c
rename to drivers/staging/media/solo6x10/disp.c
drivers/staging/media/solo6x10/enc.c renamed from drivers/staging/solo6x10/enc.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/enc.c
rename to drivers/staging/media/solo6x10/enc.c
drivers/staging/media/solo6x10/g723.c renamed from drivers/staging/solo6x10/g723.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/g723.c
rename to drivers/staging/media/solo6x10/g723.c
drivers/staging/media/solo6x10/gpio.c renamed from drivers/staging/solo6x10/gpio.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/gpio.c
rename to drivers/staging/media/solo6x10/gpio.c
drivers/staging/media/solo6x10/i2c.c renamed from drivers/staging/solo6x10/i2c.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/i2c.c
rename to drivers/staging/media/solo6x10/i2c.c
drivers/staging/media/solo6x10/jpeg.h renamed from drivers/staging/solo6x10/jpeg.h +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/jpeg.h
rename to drivers/staging/media/solo6x10/jpeg.h
drivers/staging/media/solo6x10/offsets.h renamed from drivers/staging/solo6x10/offsets.h +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/offsets.h
rename to drivers/staging/media/solo6x10/offsets.h
drivers/staging/media/solo6x10/osd-font.h renamed from drivers/staging/solo6x10/osd-font.h +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/osd-font.h
rename to drivers/staging/media/solo6x10/osd-font.h
drivers/staging/media/solo6x10/p2m.c renamed from drivers/staging/solo6x10/p2m.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/p2m.c
rename to drivers/staging/media/solo6x10/p2m.c
drivers/staging/media/solo6x10/registers.h renamed from drivers/staging/solo6x10/registers.h +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/registers.h
rename to drivers/staging/media/solo6x10/registers.h
drivers/staging/media/solo6x10/solo6x10.h renamed from drivers/staging/solo6x10/solo6x10.h +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/solo6x10.h
rename to drivers/staging/media/solo6x10/solo6x10.h
drivers/staging/media/solo6x10/tw28.c renamed from drivers/staging/solo6x10/tw28.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/tw28.c
rename to drivers/staging/media/solo6x10/tw28.c
drivers/staging/media/solo6x10/tw28.h renamed from drivers/staging/solo6x10/tw28.h +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/tw28.h
rename to drivers/staging/media/solo6x10/tw28.h
drivers/staging/media/solo6x10/v4l2-enc.c renamed from drivers/staging/solo6x10/v4l2-enc.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/v4l2-enc.c
rename to drivers/staging/media/solo6x10/v4l2-enc.c
drivers/staging/media/solo6x10/v4l2.c renamed from drivers/staging/solo6x10/v4l2.c +0 -0
similarity index 100%
rename from drivers/staging/solo6x10/v4l2.c
rename to drivers/staging/media/solo6x10/v4l2.c
Signature · 1 line
1.7.6.4
author
#3 lore raw

PATCH 3/3 staging/Makefile: Don't compile a media driver there

In reply to a message not in the archive

Otherwise, with driver as "y", compilation will break:

drivers/staging/media/as102/built-in.o: In function `as10x_cmd_get_demod_stats':
/home/v4l/work_trees/linux-next/drivers/staging/media/as102/as10x_cmd.c:306: multiple definition of `as10x_cmd_get_demod_stats' drivers/staging/media/built-in.o:/home/v4l/work_trees/linux-next/drivers/staging/media/as102/as10x_cmd.c:306: first defined here drivers/staging/media/as102/built-in.o:(.data+0x88): multiple definition of `as102_st_fw1' drivers/staging/media/built-in.o:(.data+0x88): first defined here

as the same driver is already at staging/media/Makefile.

Signed-off-by Mauro Carvalho Chehab <[email protected]>
drivers/staging/Makefile +0 -1
index cf92bc1..c1a60ef 100644
@@ -58,4 +58,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/
Signature · 1 line
1.7.6.4