aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-12-14 06:28:31 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-07 04:39:17 -0500
commit6052ba35207429b4878ccf803766d815d0edd3d4 (patch)
tree821c0d25fc7239aeb35251bfac56703b6cdada00
parentd8100f44989a07e9ceefd0735862517abd9172b9 (diff)
[media] saa6752hs: move to media/i2c
This driver is independent from saa7134, so there is no reason why this shouldn't be in media/i2c like all other i2c media drivers. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/i2c/Kconfig12
-rw-r--r--drivers/media/i2c/Makefile1
-rw-r--r--drivers/media/i2c/saa6752hs.c (renamed from drivers/media/pci/saa7134/saa6752hs.c)0
-rw-r--r--drivers/media/pci/saa7134/Kconfig1
-rw-r--r--drivers/media/pci/saa7134/Makefile2
5 files changed, 15 insertions, 1 deletions
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index fbce0186f66f..4aa9c5311cc5 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -654,6 +654,18 @@ config VIDEO_UPD64083
654 To compile this driver as a module, choose M here: the 654 To compile this driver as a module, choose M here: the
655 module will be called upd64083. 655 module will be called upd64083.
656 656
657comment "Audio/Video compression chips"
658
659config VIDEO_SAA6752HS
660 tristate "Philips SAA6752HS MPEG-2 Audio/Video Encoder"
661 depends on VIDEO_V4L2 && I2C
662 ---help---
663 Support for the Philips SAA6752HS MPEG-2 video and MPEG-audio/AC-3
664 audio encoder with multiplexer.
665
666 To compile this driver as a module, choose M here: the
667 module will be called saa6752hs.
668
657comment "Miscellaneous helper chips" 669comment "Miscellaneous helper chips"
658 670
659config VIDEO_THS7303 671config VIDEO_THS7303
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index c815bb2a0df4..48888ae876fb 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o
19obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o 19obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
20obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o 20obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
21obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o 21obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
22obj-$(CONFIG_VIDEO_SAA6752HS) += saa6752hs.o
22obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o 23obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
23obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o 24obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
24obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o 25obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
diff --git a/drivers/media/pci/saa7134/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
index 8272c0b9c5bf..8272c0b9c5bf 100644
--- a/drivers/media/pci/saa7134/saa6752hs.c
+++ b/drivers/media/i2c/saa6752hs.c
diff --git a/drivers/media/pci/saa7134/Kconfig b/drivers/media/pci/saa7134/Kconfig
index 15b90d6e9130..7883393571e5 100644
--- a/drivers/media/pci/saa7134/Kconfig
+++ b/drivers/media/pci/saa7134/Kconfig
@@ -6,6 +6,7 @@ config VIDEO_SAA7134
6 select VIDEO_TVEEPROM 6 select VIDEO_TVEEPROM
7 select CRC32 7 select CRC32
8 select VIDEO_SAA6588 if MEDIA_SUBDRV_AUTOSELECT 8 select VIDEO_SAA6588 if MEDIA_SUBDRV_AUTOSELECT
9 select VIDEO_SAA6752HS if MEDIA_SUBDRV_AUTOSELECT
9 ---help--- 10 ---help---
10 This is a video4linux driver for Philips SAA713x based 11 This is a video4linux driver for Philips SAA713x based
11 TV cards. 12 TV cards.
diff --git a/drivers/media/pci/saa7134/Makefile b/drivers/media/pci/saa7134/Makefile
index 35375480ed4d..58de9b085689 100644
--- a/drivers/media/pci/saa7134/Makefile
+++ b/drivers/media/pci/saa7134/Makefile
@@ -4,7 +4,7 @@ saa7134-y += saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o
4saa7134-y += saa7134-video.o 4saa7134-y += saa7134-video.o
5saa7134-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-input.o 5saa7134-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-input.o
6 6
7obj-$(CONFIG_VIDEO_SAA7134) += saa6752hs.o saa7134.o saa7134-empress.o 7obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o
8 8
9obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o 9obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
10 10