Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Convert most new-style drivers to use module aliasing
  i2c: Add support for device alias names
  i2c-amd756-s4882: Fix an error path
  i2c: Drop unused RTC driver IDs
  i2c/tps65010: Add missing intialization of client data
  i2c-sis5595: Minor cleanups in sis5595_access
  i2c-piix4: Minor cleanups
  i2c: Spelling fix (successful)
  i2c-stub: No newline in parameter description

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 45bda186befc..fa2d2f8b3f4d 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -41,6 +41,12 @@
 #define DS1374_REG_SR_AF        0x01 /* Alarm Flag */
 #define DS1374_REG_TCR          0x09 /* Trickle Charge */
 
+static const struct i2c_device_id ds1374_id[] = {
+        { "rtc-ds1374", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ds1374_id);
+
 struct ds1374 {
         struct i2c_client *client;
         struct rtc_device *rtc;
@@ -355,7 +361,8 @@ static const struct rtc_class_ops ds1374_rtc_ops = {
         .ioctl = ds1374_ioctl,
 };
 
-static int ds1374_probe(struct i2c_client *client)
+static int ds1374_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
 {
         struct ds1374 *ds1374;
         int ret;
@@ -429,6 +436,7 @@ static struct i2c_driver ds1374_driver = {
         },
         .probe = ds1374_probe,
         .remove = __devexit_p(ds1374_remove),
+        .id_table = ds1374_id,
 };
 
 static int __init ds1374_init(void)