V4L/DVB (13259): saa7134: fix badly merged DTV1000S patch
authorMichael Krufky <mkrufky@kernellabs.com>
Sat, 31 Oct 2009 16:46:08 +0000 (13:46 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 5 Dec 2009 20:41:08 +0000 (18:41 -0200)
commit53c8ec5e0e93f1ab600f91203ede43b83b3361ba
treec26257451e9ed20f684cc3e5c7a71eeda860c5e9
parent928213aad76e0036290901d244d614c01cac7278
V4L/DVB (13259): saa7134: fix badly merged DTV1000S patch

As pointed out by Hermann Pitton, it turns out that the DTV1000S card's
analog entry made it into the #if 0 flyvideo tweaks in saa7134-cards.c
and is not valid there.

This patch fixes the problem.

Cc: hermann pitton <hermann-pitton@arcor.de>
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/saa7134/saa7134-cards.c