summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2018-01-08 23:20:01 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2018-01-23 16:05:02 +0300
commit7952be9b6ece3d3c4d61f9811d7e5a984580064a (patch)
treec4ff80f1260e865bada91ddd2a0e5e777514dff8 /drivers
parentc81ceb58e10124b79b9a01c70b9c25b2fe540475 (diff)
downloadlinux-7952be9b6ece3d3c4d61f9811d7e5a984580064a.tar.xz
media: drivers/media/common/videobuf2: rename from videobuf
This directory contains the videobuf2 framework, so name the directory accordingly. The name 'videobuf' typically refers to the old and deprecated videobuf version 1 framework so that was confusing. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/Kconfig2
-rw-r--r--drivers/media/common/Makefile2
-rw-r--r--drivers/media/common/videobuf2/Kconfig (renamed from drivers/media/common/videobuf/Kconfig)0
-rw-r--r--drivers/media/common/videobuf2/Makefile (renamed from drivers/media/common/videobuf/Makefile)0
-rw-r--r--drivers/media/common/videobuf2/videobuf2-core.c (renamed from drivers/media/common/videobuf/videobuf2-core.c)0
-rw-r--r--drivers/media/common/videobuf2/videobuf2-dma-contig.c (renamed from drivers/media/common/videobuf/videobuf2-dma-contig.c)0
-rw-r--r--drivers/media/common/videobuf2/videobuf2-dma-sg.c (renamed from drivers/media/common/videobuf/videobuf2-dma-sg.c)0
-rw-r--r--drivers/media/common/videobuf2/videobuf2-dvb.c (renamed from drivers/media/common/videobuf/videobuf2-dvb.c)0
-rw-r--r--drivers/media/common/videobuf2/videobuf2-memops.c (renamed from drivers/media/common/videobuf/videobuf2-memops.c)0
-rw-r--r--drivers/media/common/videobuf2/videobuf2-v4l2.c (renamed from drivers/media/common/videobuf/videobuf2-v4l2.c)0
-rw-r--r--drivers/media/common/videobuf2/videobuf2-vmalloc.c (renamed from drivers/media/common/videobuf/videobuf2-vmalloc.c)0
11 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index cdfc905967dc..0cb7d819a5d2 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -16,7 +16,7 @@ config CYPRESS_FIRMWARE
tristate "Cypress firmware helper routines"
depends on USB
-source "drivers/media/common/videobuf/Kconfig"
+source "drivers/media/common/videobuf2/Kconfig"
source "drivers/media/common/b2c2/Kconfig"
source "drivers/media/common/saa7146/Kconfig"
source "drivers/media/common/siano/Kconfig"
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index f24b5ed39982..e7bc17abbbbc 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,4 +1,4 @@
-obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf/
+obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/
obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o
diff --git a/drivers/media/common/videobuf/Kconfig b/drivers/media/common/videobuf2/Kconfig
index 5df05250de94..5df05250de94 100644
--- a/drivers/media/common/videobuf/Kconfig
+++ b/drivers/media/common/videobuf2/Kconfig
diff --git a/drivers/media/common/videobuf/Makefile b/drivers/media/common/videobuf2/Makefile
index 19de5ccda20b..19de5ccda20b 100644
--- a/drivers/media/common/videobuf/Makefile
+++ b/drivers/media/common/videobuf2/Makefile
diff --git a/drivers/media/common/videobuf/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index f7109f827f6e..f7109f827f6e 100644
--- a/drivers/media/common/videobuf/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
diff --git a/drivers/media/common/videobuf/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index f1178f6f434d..f1178f6f434d 100644
--- a/drivers/media/common/videobuf/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
diff --git a/drivers/media/common/videobuf/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
index 753ed3138dcc..753ed3138dcc 100644
--- a/drivers/media/common/videobuf/videobuf2-dma-sg.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
diff --git a/drivers/media/common/videobuf/videobuf2-dvb.c b/drivers/media/common/videobuf2/videobuf2-dvb.c
index 9f38b4218c0d..9f38b4218c0d 100644
--- a/drivers/media/common/videobuf/videobuf2-dvb.c
+++ b/drivers/media/common/videobuf2/videobuf2-dvb.c
diff --git a/drivers/media/common/videobuf/videobuf2-memops.c b/drivers/media/common/videobuf2/videobuf2-memops.c
index 89e51989332b..89e51989332b 100644
--- a/drivers/media/common/videobuf/videobuf2-memops.c
+++ b/drivers/media/common/videobuf2/videobuf2-memops.c
diff --git a/drivers/media/common/videobuf/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index fac3cd6f901d..fac3cd6f901d 100644
--- a/drivers/media/common/videobuf/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
diff --git a/drivers/media/common/videobuf/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
index 3a7c80cd1a17..3a7c80cd1a17 100644
--- a/drivers/media/common/videobuf/videobuf2-vmalloc.c
+++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c