---

yaml --- r: 30062 b: refs/heads/master c: 5d1a9ae h: refs/heads/master v: v3
git-mirror · Jun 25, 2006 · f6cc0f0 · f6cc0f0
1 parent d32d26e
commit f6cc0f0
Show file tree

Hide file tree

Showing 6 changed files with 939 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cb2318b885d2039eeb3eb5394fa215046be058f
+refs/heads/master: 5d1a9ae6d9d7fc14b2259cd550eb87364a21190a
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
@@ -82,6 +82,9 @@ config VIDEO_IR
 config VIDEO_TVEEPROM
 	tristate
 
+config VIDEO_CX2341X
+	tristate
+
 config USB_DABUSB
 	tristate "DABUSB driver"
 	depends on USB

diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
@@ -73,6 +73,7 @@ obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
 obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
 obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
 obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
+obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o
 obj-$(CONFIG_USB_DSBR)          += dsbr100.o