diff options
| author | Mike Krufky <mkrufky@linuxtv.org> | 2005-10-23 15:57:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-23 19:38:39 -0400 |
| commit | c0fef676bbd75e711711ed3ff5bebb7bfd1bdb00 (patch) | |
| tree | 00b64d3cb25ff7bd9c30b5ca763158a6c2e88666 | |
| parent | 20c19e4179884d7e843314071e2dfb1ea7b0afcd (diff) | |
[PATCH] Kconfig: saa7134-dvb should not select cx22702
On 2005-05-01, Gerd Knorr sent in a patch to add cx22702 to cx88-dvb:
[PATCH] dvb: cx22702 frontend driver update
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9990d744bea7d28e83c420e2c9d524c7a8a2d136
...but as we can see, the Kconfig portion of his patch was incorrectly
applied to saa7134-dvb instead of cx88-dvb.
On 2005-06-24, Adrian bunk fixed cx88-dvb:
[PATCH] VIDEO_CX88_DVB must select DVB_CX22702
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d6988588e13616587aa879c2e0bd7cd811705e5d
...but we never removed the original patch from Gerd.
This patch sets things straight:
saa7134-dvb should not select cx22702
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/media/video/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 93570355819a..bbb989df4cf0 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -262,7 +262,6 @@ config VIDEO_SAA7134_DVB | |||
| 262 | depends on VIDEO_SAA7134 && DVB_CORE | 262 | depends on VIDEO_SAA7134 && DVB_CORE |
| 263 | select VIDEO_BUF_DVB | 263 | select VIDEO_BUF_DVB |
| 264 | select DVB_MT352 | 264 | select DVB_MT352 |
| 265 | select DVB_CX22702 | ||
| 266 | select DVB_TDA1004X | 265 | select DVB_TDA1004X |
| 267 | ---help--- | 266 | ---help--- |
| 268 | This adds support for DVB cards based on the | 267 | This adds support for DVB cards based on the |