---

yaml --- r: 330939 b: refs/heads/master c: 54450f5 h: refs/heads/master i: 330937: 404b97e 330935: 80d97b0 v: v3
git-mirror · Sep 13, 2012 · 8485d67 · 8485d67
1 parent bade83b
commit 8485d67
Show file tree

Hide file tree

Showing 6 changed files with 2,129 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c61bd6a0e2a92009f3879457eeec75b5ad102303
+refs/heads/master: 54450f591c9927496b3d41c041fa802d0ef96885
diff --git a/trunk/drivers/media/i2c/Kconfig b/trunk/drivers/media/i2c/Kconfig
@@ -188,6 +188,18 @@ config VIDEO_ADV7183
 	  To compile this driver as a module, choose M here: the
 	  module will be called adv7183.
 
+config VIDEO_ADV7604
+	tristate "Analog Devices ADV7604 decoder"
+	depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
+	---help---
+	  Support for the Analog Devices ADV7604 video decoder.
+
+	  This is a Analog Devices Component/Graphics Digitizer
+	  with 4:1 Multiplexed HDMI Receiver.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called adv7604.
+
 config VIDEO_BT819
 	tristate "BT819A VideoStream decoder"
 	depends on VIDEO_V4L2 && I2C

diff --git a/trunk/drivers/media/i2c/Makefile b/trunk/drivers/media/i2c/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
 obj-$(CONFIG_VIDEO_ADV7183) += adv7183.o
 obj-$(CONFIG_VIDEO_ADV7343) += adv7343.o
 obj-$(CONFIG_VIDEO_ADV7393) += adv7393.o
+obj-$(CONFIG_VIDEO_ADV7604) += adv7604.o
 obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
 obj-$(CONFIG_VIDEO_VS6624)  += vs6624.o
 obj-$(CONFIG_VIDEO_BT819) += bt819.o