Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6] / drivers / rtc / rtc-x1205.c

diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 095282f635236b106b9eb3b51b7a354f39b813ac..eaf55945f21bbf860318a082b24463caa8648ebc 100644 (file)
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -494,7 +494,8 @@ static void x1205_sysfs_unregister(struct device *dev)
 }
 
 
-static int x1205_probe(struct i2c_client *client)
+static int x1205_probe(struct i2c_client *client,
+                       const struct i2c_device_id *id)
 {
        int err = 0;
        unsigned char sr;
@@ -552,12 +553,19 @@ static int x1205_remove(struct i2c_client *client)
        return 0;
 }
 
+static const struct i2c_device_id x1205_id[] = {
+       { "x1205", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, x1205_id);
+
 static struct i2c_driver x1205_driver = {
        .driver         = {
                .name   = "rtc-x1205",
        },
        .probe          = x1205_probe,
        .remove         = x1205_remove,
+       .id_table       = x1205_id,
 };
 
 static int __init x1205_init(void)