diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/media/video/bttv-cards.c | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/media/video/bttv-cards.c')
| -rw-r--r-- | drivers/media/video/bttv-cards.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index 2dbf5ec43abd..6c52fd0bb7df 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | $Id: bttv-cards.c,v 1.53 2005/07/05 17:37:35 nsh Exp $ | 2 | $Id: bttv-cards.c,v 1.54 2005/07/19 18:26:46 mkrufky Exp $ |
| 3 | 3 | ||
| 4 | bttv-cards.c | 4 | bttv-cards.c |
| 5 | 5 | ||
| @@ -2772,8 +2772,6 @@ void __devinit bttv_init_card2(struct bttv *btv) | |||
| 2772 | } | 2772 | } |
| 2773 | btv->pll.pll_current = -1; | 2773 | btv->pll.pll_current = -1; |
| 2774 | 2774 | ||
| 2775 | bttv_reset_audio(btv); | ||
| 2776 | |||
| 2777 | /* tuner configuration (from card list / autodetect / insmod option) */ | 2775 | /* tuner configuration (from card list / autodetect / insmod option) */ |
| 2778 | if (UNSET != bttv_tvcards[btv->c.type].tuner_type) | 2776 | if (UNSET != bttv_tvcards[btv->c.type].tuner_type) |
| 2779 | if(UNSET == btv->tuner_type) | 2777 | if(UNSET == btv->tuner_type) |