diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-14 16:36:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-13 23:52:49 -0300 |
| commit | ed0c8b5465d6cec5458d9a3041a5167d83f40fdb (patch) | |
| tree | dd9e9af17c4172355422f1112dad3a5143509262 /drivers/media/common | |
| parent | ccae7af2bf07dfef69cc2eb6ebc9e1ff15addfbd (diff) | |
| download | linux-stable-ed0c8b5465d6cec5458d9a3041a5167d83f40fdb.tar.gz linux-stable-ed0c8b5465d6cec5458d9a3041a5167d83f40fdb.tar.bz2 linux-stable-ed0c8b5465d6cec5458d9a3041a5167d83f40fdb.zip | |
[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>
Diffstat (limited to 'drivers/media/common')
| -rw-r--r-- | drivers/media/common/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/media/common/Makefile | 7 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/Makefile | 5 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_core.c (renamed from drivers/media/common/saa7146_core.c) | 0 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_fops.c (renamed from drivers/media/common/saa7146_fops.c) | 0 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_hlp.c (renamed from drivers/media/common/saa7146_hlp.c) | 0 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_i2c.c (renamed from drivers/media/common/saa7146_i2c.c) | 0 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_vbi.c (renamed from drivers/media/common/saa7146_vbi.c) | 0 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_video.c (renamed from drivers/media/common/saa7146_video.c) | 0 |
10 files changed, 16 insertions, 16 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index 4672f7d82f67..157f191ef646 100644 --- 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 a471242c46a7..f3afd83843e0 100644 --- 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 index 000000000000..769c6f8142d2 --- /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 index 000000000000..3219b00a8771 --- /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 index bb6ee5191eb1..bb6ee5191eb1 100644 --- a/drivers/media/common/saa7146_core.c +++ b/drivers/media/common/saa7146/saa7146_core.c diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c index b3890bd49df6..b3890bd49df6 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146/saa7146_fops.c diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c index be746d1aee9a..be746d1aee9a 100644 --- a/drivers/media/common/saa7146_hlp.c +++ b/drivers/media/common/saa7146/saa7146_hlp.c diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146/saa7146_i2c.c index 22027198129d..22027198129d 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146/saa7146_i2c.c diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c index 1e71e374bbfe..1e71e374bbfe 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146/saa7146_vbi.c diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c index 6d14785d4747..6d14785d4747 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146/saa7146_video.c |