diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 06:54:00 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 06:54:00 -0400 |
| commit | 7063e6c717f6108c4b3fc3135a516c86ef944870 (patch) | |
| tree | ec6eec10b4dc93474100e6e366df028bd3314fda /drivers/media/video/bttv-cards.c | |
| parent | 7ca0026495dbb644b4e32ede76be44072cb2bc7a (diff) | |
| parent | 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/video/bttv-cards.c')
| -rw-r--r-- | drivers/media/video/bttv-cards.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index 85224b90e394..6334122704ae 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
| @@ -1946,7 +1946,6 @@ struct tvcard bttv_tvcards[] = { | |||
| 1946 | .no_tda9875 = 1, | 1946 | .no_tda9875 = 1, |
| 1947 | .no_tda7432 = 1, | 1947 | .no_tda7432 = 1, |
| 1948 | .tuner_type = TUNER_ABSENT, | 1948 | .tuner_type = TUNER_ABSENT, |
| 1949 | .no_video = 1, | ||
| 1950 | .pll = PLL_28, | 1949 | .pll = PLL_28, |
| 1951 | },{ | 1950 | },{ |
| 1952 | .name = "Teppro TEV-560/InterVision IV-560", | 1951 | .name = "Teppro TEV-560/InterVision IV-560", |