summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/tda8290.c4
-rw-r--r--linux/include/media/tuner.h3
2 files changed, 4 insertions, 3 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, \