diff --git a/[refs] b/[refs] index c38ca56b2e7b..ed5ddca9b13a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f7591c04f3797694e331a31d00317ae4acb9af0 +refs/heads/master: 3375c39844b58ad8a5d9f454fa908d722a94a5a4 diff --git a/trunk/drivers/media/video/tda9887.c b/trunk/drivers/media/video/tda9887.c index 10f14bc23ed4..ba22f12e8b32 100644 --- a/trunk/drivers/media/video/tda9887.c +++ b/trunk/drivers/media/video/tda9887.c @@ -180,7 +180,7 @@ static struct tvnorm tvnorms[] = { .name = "SECAM-L", .b = ( cPositiveAmTV | cQSS ), - .e = ( cGaiting_36 | + .e = ( cGating_36 | cAudioIF_6_5 | cVideoIF_38_90 ), },{ @@ -330,7 +330,7 @@ static void dump_write_message(unsigned char *buf) printk(PREFIX "write: byte E 0x%02x\n",buf[3]); printk(" E0-1 sound carrier : %s\n", carrier[(buf[3] & 0x03)]); - printk(" E6 l pll gaiting : %s\n", + printk(" E6 l pll gating : %s\n", (buf[3] & 0x40) ? "36" : "13"); if (buf[1] & 0x08) {