diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 00:33:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 00:33:59 -0300 |
| commit | 21caee2a17a4430d00a96e72f6fcb406ae40295f (patch) | |
| tree | ba1585accfd49ac2001493d605ab61052f0501b2 /linux/drivers/media/video/tuner-core.c | |
| parent | ade6577c13a32eaef761a14550dd18af91b8ace3 (diff) | |
| download | mediapointer-dvb-s2-21caee2a17a4430d00a96e72f6fcb406ae40295f.tar.gz mediapointer-dvb-s2-21caee2a17a4430d00a96e72f6fcb406ae40295f.tar.bz2 | |
backport commit d2653e92732bd3911feff6bee5e23dbf959381db
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Author: Jean Delvare <khali@linux-fr.org>
Date: Tue Apr 29 23:11:39 2008 +0200
i2c: Add support for device alias names
Based on earlier work by Jon Smirl and Jochen Friedrich.
This patch allows new-style i2c chip drivers to have alias names using
the official kernel aliasing system and MODULE_DEVICE_TABLE(). At this
point, the old i2c driver binding scheme (driver_name/type) is still
supported.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index f4cac029f..6ed0dc670 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1148,7 +1148,8 @@ static void tuner_lookup(struct i2c_adapter *adap, /* During client attach, set_type is called by adapter's attach_inform callback. set_type must then be completed by tuner_probe. */ -static int tuner_probe(struct i2c_client *client) +static int tuner_probe(struct i2c_client *client, + const struct i2c_device_id *id) { struct tuner *t; struct tuner *radio; |