[media] saa7146: Move it to its own directory

In order to better organize the directory tree, move the
saa7146 common driver to its own directory.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 4672f7d82f672fe46c06cb3adca3baa0e8ceb7dc..157f191ef646b7136d4a6c5b9e9005b6b23b23d3 100644 (file)
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -1,11 +1,2 @@
-config VIDEO_SAA7146
-       tristate
-       depends on I2C && PCI
-
-config VIDEO_SAA7146_VV
-       tristate
-       depends on VIDEO_V4L2
-       select VIDEOBUF_DMA_SG
-       select VIDEO_SAA7146
-
 source "drivers/media/common/b2c2/Kconfig"
+source "drivers/media/common/saa7146/Kconfig"

diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index a471242c46a72b8703924dbeac62aaa843b93a1f..f3afd83843e03fbfe4c8c2effb6699cd54f9ee1d 100644 (file)
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,6 +1 @@
-saa7146-objs    := saa7146_i2c.o saa7146_core.o
-saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-
-obj-y += b2c2/
-obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
-obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
+obj-y += b2c2/ saa7146/

diff --git a/drivers/media/common/saa7146/Kconfig b/drivers/media/common/saa7146/Kconfig
new file mode 100644 (file)
index 0000000..769c6f8
--- /dev/null
+++ b/drivers/media/common/saa7146/Kconfig
@@ -0,0 +1,9 @@
+config VIDEO_SAA7146
+       tristate
+       depends on I2C && PCI
+
+config VIDEO_SAA7146_VV
+       tristate
+       depends on VIDEO_V4L2
+       select VIDEOBUF_DMA_SG
+       select VIDEO_SAA7146

diff --git a/drivers/media/common/saa7146/Makefile b/drivers/media/common/saa7146/Makefile
new file mode 100644 (file)
index 0000000..3219b00
--- /dev/null
+++ b/drivers/media/common/saa7146/Makefile
@@ -0,0 +1,5 @@
+saa7146-objs    := saa7146_i2c.o saa7146_core.o
+saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
+
+obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
+obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
similarity index 100%
rename from drivers/media/common/saa7146_core.c
rename to drivers/media/common/saa7146/saa7146_core.c

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
similarity index 100%
rename from drivers/media/common/saa7146_fops.c
rename to drivers/media/common/saa7146/saa7146_fops.c

diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c
similarity index 100%
rename from drivers/media/common/saa7146_hlp.c
rename to drivers/media/common/saa7146/saa7146_hlp.c

diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146/saa7146_i2c.c
similarity index 100%
rename from drivers/media/common/saa7146_i2c.c
rename to drivers/media/common/saa7146/saa7146_i2c.c

diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c
similarity index 100%
rename from drivers/media/common/saa7146_vbi.c
rename to drivers/media/common/saa7146/saa7146_vbi.c

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c
similarity index 100%
rename from drivers/media/common/saa7146_video.c
rename to drivers/media/common/saa7146/saa7146_video.c