summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/stradis.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-02-16 21:49:31 -0500
committerMichael Krufky <mkrufky@linuxtv.org>2008-02-16 21:49:31 -0500
commit381bcd3aa9c4c844cb415342a0ab21622c596488 (patch)
tree75e79ed984e931dc37c254639d99d63d59c4aba6 /linux/drivers/media/video/stradis.c
parent7e39be7b7313d51ad3be46803a5918f1b2914b82 (diff)
parent18ac0ef62eca3a89e0bf1f3c23bb7004e760d15b (diff)
downloadmediapointer-dvb-s2-381bcd3aa9c4c844cb415342a0ab21622c596488.tar.gz
mediapointer-dvb-s2-381bcd3aa9c4c844cb415342a0ab21622c596488.tar.bz2
merge: ~stoth/pci-nano
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/stradis.c')
-rw-r--r--linux/drivers/media/video/stradis.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/stradis.c b/linux/drivers/media/video/stradis.c
index f5de75513..c095e1453 100644
--- a/linux/drivers/media/video/stradis.c
+++ b/linux/drivers/media/video/stradis.c
@@ -59,7 +59,7 @@
static struct saa7146 saa7146s[SAA7146_MAX];
-static int saa_num = 0; /* number of SAA7146s in use */
+static int saa_num; /* number of SAA7146s in use */
static int video_nr = -1;
module_param(video_nr, int, 0);
@@ -249,7 +249,7 @@ static void I2CBusScan(struct saa7146 *saa)
attach_inform(saa, i);
}
-static int debiwait_maxwait = 0;
+static int debiwait_maxwait;
static int wait_for_debi_done(struct saa7146 *saa)
{