From 56df4af406105d8206c3beb23121c872b01258c1 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 27 Oct 2005 04:56:17 +0000 Subject: * ../linux/drivers/media/video/tuner-simple.c: (default_set_tv_freq): - ISO C90 forbids mixed declarations and code * ../v4l/compat.h: - Do not build support for nxt200x unless at least one of the following is true: a) KERNEL_VERSION >= 2.6.15 b) v4l / dvb merge-trees build environment. Signed-off-by: Michael Krufky --- linux/drivers/media/video/tuner-simple.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index 8f721130d..8a9d03567 100644 --- a/linux/drivers/media/video/tuner-simple.c +++ b/linux/drivers/media/video/tuner-simple.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-simple.c,v 1.55 2005/10/27 04:33:27 mkrufky Exp $ + * $Id: tuner-simple.c,v 1.56 2005/10/27 04:56:17 mkrufky Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -317,7 +317,7 @@ static int tuner_mode (struct i2c_client *c) static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) { struct tuner *t = i2c_get_clientdata(c); - u8 config; + u8 config, tuneraddr; u16 div; struct tunertype *tun; unsigned char buffer[4]; @@ -411,7 +411,6 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) buffer[1] = 0x04; } /* set to the correct mode (analog or digital) */ - u8 tuneraddr; tuneraddr = c->addr; c->addr = 0x0a; if (2 != (rc = i2c_master_send(c,&buffer[0],2))) -- cgit v1.2.3