From e18ec26aff50e3b1d51a7acb202e6d22e9bb0e17 Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Sat, 25 Oct 2008 21:33:22 -0300
Subject: [PATCH] --- yaml --- r: 124119 b: refs/heads/master c:
 667d75e7c61e73a59ff452b3a5ce04d9b3e8eca5 h: refs/heads/master i:   124117:
 8e51d714e7549bc36d8519a6e34848f17687f906   124115:
 e316e35c3ee15c816757cb1fb0f1287811d189c5   124111:
 c64c90117f8e2469f2ddaa5f5c662a9a2719405f v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/cx18/cx18-driver.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 55d3a6daac3f..7b564dabc530 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5f4c0ce682efa60fa9552514118bb70a7646e28
+refs/heads/master: 667d75e7c61e73a59ff452b3a5ce04d9b3e8eca5
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
index 7874d9790a51..d7879fb1d21f 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.c
+++ b/trunk/drivers/media/video/cx18/cx18-driver.c
@@ -739,8 +739,6 @@ static int __devinit cx18_probe(struct pci_dev *dev,
 		cx->std = V4L2_STD_NTSC_M;
 
 	if (cx->options.tuner == -1) {
-		int i;
-
 		for (i = 0; i < CX18_CARD_MAX_TUNERS; i++) {
 			if ((cx->std & cx->card->tuners[i].std) == 0)
 				continue;