From: Michael Krufky <mkrufky@kernellabs.com>
Date: Sat, 31 Oct 2009 16:46:08 +0000 (-0300)
Subject: V4L/DVB (13259): saa7134: fix badly merged DTV1000S patch
X-Git-Tag: v2.6.33-rc1~338^2~185
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53c8ec5e0e93f1ab600f91203ede43b83b3361ba;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed