From 1264e71d82f93043bdbdf6607881645541b638a0 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 22 Apr 2008 14:46:07 -0300 Subject: [PATCH] --- yaml --- r: 92513 b: refs/heads/master c: c1e6393e24e0fcc8047db18dce05758c3fd54515 h: refs/heads/master i: 92511: 9031084b0ea8e11c050162942a0d8a3e864ec5ba v: v3 --- [refs] | 2 +- trunk/drivers/media/video/bt8xx/bttv-cards.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1850e0b64640..92d4f5805374 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e741713913fd28f8291fddb3d32d9353f1f0472 +refs/heads/master: c1e6393e24e0fcc8047db18dce05758c3fd54515 diff --git a/trunk/drivers/media/video/bt8xx/bttv-cards.c b/trunk/drivers/media/video/bt8xx/bttv-cards.c index 4a82cd2dd66a..f20a01cfc73e 100644 --- a/trunk/drivers/media/video/bt8xx/bttv-cards.c +++ b/trunk/drivers/media/video/bt8xx/bttv-cards.c @@ -3027,9 +3027,7 @@ struct tvcard bttv_tvcards[] = { .gpiomask = 0x008007, .muxsel = { 2, 3, 1, 1 }, .gpiomux = { 0, 1, 2, 2 }, /* CONTVFMi */ - /*gpiomux = { 0, 1, 2, 3 }, /* MagicTV */ .gpiomute = 3, /* CONTVFMi */ - /*gpiomute = 4, /* MagicTV */ .needs_tvaudio = 0, .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */ .tuner_addr = ADDR_UNSET,