diff options
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 1 | ||||
| -rw-r--r-- | v4l/ChangeLog | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 47c45b959..4841165b2 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -262,7 +262,6 @@ config VIDEO_SAA7134_DVB depends on VIDEO_SAA7134 && DVB_CORE select VIDEO_BUF_DVB select DVB_MT352 - select DVB_CX22702 select DVB_TDA1004X ---help--- This adds support for DVB cards based on the 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: |