diff options
| -rw-r--r-- | linux/drivers/media/video/tda8290.c | 4 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
3 files changed, 14 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c index 32e8dfd88..dbd7b2911 100644 --- a/linux/drivers/media/video/tda8290.c +++ b/linux/drivers/media/video/tda8290.c @@ -1,5 +1,5 @@ /* - $Id: tda8290.c,v 1.25 2005/10/18 23:34:22 hhackmann Exp $ + $Id: tda8290.c,v 1.26 2005/10/18 23:51:21 nsh Exp $ i2c tv tuner chip device driver controls the philips tda8290+75 tuner chip combo. @@ -537,7 +537,7 @@ int tda8290_init(struct i2c_client *c) if (tuner_addrs == 0) { tuner_addrs = 0x61; tuner_info ("could not clearly identify tuner address, defaulting to %x\n", - tuner_addrs); + tuner_addrs); } else { tuner_addrs = tuner_addrs & 0xff; tuner_info ("setting tuner address to %x\n", tuner_addrs); diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 04753fdda..8d5de0ea0 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,4 +1,4 @@ -/* $Id: tuner.h,v 1.58 2005/10/17 21:01:35 hhackmann Exp $ +/* $Id: tuner.h,v 1.59 2005/10/18 23:51:21 nsh Exp $ * tuner.h - definition for different tuners @@ -215,6 +215,7 @@ extern int tda8290_init(struct i2c_client *c); extern int tea5767_tuner_init(struct i2c_client *c); extern int default_tuner_init(struct i2c_client *c); extern int tea5767_autodetection(struct i2c_client *c); +extern int tda8290_probe(struct i2c_client *c); #define tuner_warn(fmt, arg...) do {\ printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 296b86de3..e4ec457f6 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,10 +1,19 @@ +2005-10-18 23:50 nshmyrev + + * ../linux/drivers/media/video/tda8290.c: (tda8290_init): + * ../linux/include/media/tuner.h: + - Unify whitespaces. + - Fix build warning. + + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-10-19 01:00 hhackmann * ../linux/drivers/media/video/tda8290.c: * ../linux/drivers/media/video/tuner-core.c: - corrected probing code for tda8290 - Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t.online.de> + Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t.online.de> 2005-10-18 23:42 mkrufky |