summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/upd64083.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-02 00:33:59 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-02 00:33:59 -0300
commit21caee2a17a4430d00a96e72f6fcb406ae40295f (patch)
treeba1585accfd49ac2001493d605ab61052f0501b2 /linux/drivers/media/video/upd64083.c
parentade6577c13a32eaef761a14550dd18af91b8ace3 (diff)
downloadmediapointer-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/upd64083.c')
-rw-r--r--linux/drivers/media/video/upd64083.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/upd64083.c b/linux/drivers/media/video/upd64083.c
index 5d441538f..e43cc103f 100644
--- a/linux/drivers/media/video/upd64083.c
+++ b/linux/drivers/media/video/upd64083.c
@@ -186,7 +186,8 @@ static int upd64083_command(struct i2c_client *client, unsigned cmd, void *arg)
/* i2c implementation */
-static int upd64083_probe(struct i2c_client *client)
+static int upd64083_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
{
struct upd64083_state *state;
int i;