From 476d74f61b2f52a2f05c55f9df73671fc8c89451 Mon Sep 17 00:00:00 2001
From: Michael Krufky <devnull@localhost>
Date: Tue, 25 Oct 2005 01:13:02 +0000
Subject:         - saa7134-dvb should not select cx22702

        This patch is already in 2.6.14-rc5-git3
        commit: c0fef676bbd75e711711ed3ff5bebb7bfd1bdb00

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>
        Signed-off-by: Andrew Morton <akpm@osdl.org>
        Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
 v4l/ChangeLog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'v4l')

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index cd10720f5..cee21eec7 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-25 01:08  mkrufky
+
+	* ../linux/drivers/media/video/Kconfig:
+	- saa7134-dvb should not select cx22702
+
+	This patch is already in 2.6.14-rc5-git3
+	commit: c0fef676bbd75e711711ed3ff5bebb7bfd1bdb00
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+	Signed-off-by: Andrew Morton <akpm@osdl.org>
+	Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+
 2005-10-25 00:53  mkrufky
 
 	* ../linux/drivers/media/video/Kconfig:
-- 
cgit v1.2.3