Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

[linux-2.6] / drivers / media / video / upd64083.c

diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index 2d9a88f70c85ba2ac2efdebb9ac02d895ddea50c..9ab712a56ce0a9e1e4b11940a6770c3672c7b1a6 100644 (file)
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -172,7 +172,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;