Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / menelaus.c

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index d4d1ccc954866d693bd8bba651701a1c1fb614bb..f02ce23ca0ea2d4b501cf9d69f7ae7e34b58ca3f 100644 (file)
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -1178,7 +1178,8 @@ static inline void menelaus_rtc_init(struct menelaus_chip *m)
 
 static struct i2c_driver menelaus_i2c_driver;
 
-static int menelaus_probe(struct i2c_client *client)
+static int menelaus_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
        struct menelaus_chip    *menelaus;
        int                     rev = 0, val;
@@ -1271,12 +1272,19 @@ static int __exit menelaus_remove(struct i2c_client *client)
        return 0;
 }
 
+static const struct i2c_device_id menelaus_id[] = {
+       { "menelaus", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, menelaus_id);
+
 static struct i2c_driver menelaus_i2c_driver = {
        .driver = {
                .name           = DRIVER_NAME,
        },
        .probe          = menelaus_probe,
        .remove         = __exit_p(menelaus_remove),
+       .id_table       = menelaus_id,
 };
 
 static int __init menelaus_init(void)