diff options
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 5 | ||||
| -rw-r--r-- | v4l/ChangeLog | 15 | ||||
| -rw-r--r-- | v4l/compat.h | 5 |
3 files changed, 21 insertions, 4 deletions
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))) diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 7b6cc8a2e..789427677 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,18 @@ +2005-10-27 04:50 mkrufky + + * ../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 <mkrufky@m1k.net> + 2005-10-27 04:27 mkrufky * ../linux/drivers/media/video/cx88/Kconfig: diff --git a/v4l/compat.h b/v4l/compat.h index be421393c..ebbea9492 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.27 2005/10/20 20:11:39 nsh Exp $ + * $Id: compat.h,v 1.28 2005/10/27 04:56:18 mkrufky Exp $ */ #ifndef _COMPAT_H @@ -134,6 +134,9 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) #undef HAVE_LGDT330X #undef HAVE_TDA1004X #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) +#undef HAVE_NXT200X +#endif #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) |