Merge commit 'v2.6.28-rc8' into sched/core

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
index 80782798763f..a4f6665ab3c5 100644
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -247,12 +247,18 @@ max6900_probe(struct i2c_client *client, const struct i2c_device_id *id)
         return 0;
 }
 
+static struct i2c_device_id max6900_id[] = {
+        { "max6900", 0 },
+        { }
+};
+
 static struct i2c_driver max6900_driver = {
         .driver = {
                    .name = "rtc-max6900",
                    },
         .probe = max6900_probe,
         .remove = max6900_remove,
+        .id_table = max6900_id,
 };
 
 static int __init max6900_init(void)