From dff188bebd039bc29895bc189bac05f518620d6d Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 5 Jun 2008 22:46:18 -0700
Subject: [PATCH] --- yaml --- r: 97800 b: refs/heads/master c:
 f2eb432715a81a703e626df59347ba3557009557 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/sysdev/fsl_soc.c | 2 +-
 trunk/drivers/of/of_i2c.c           | 1 -
 trunk/drivers/rtc/rtc-ds1374.c      | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b6604617e5d3..868e3842ef1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44d1b980c72db0faf35adb082fb2208351803028
+refs/heads/master: f2eb432715a81a703e626df59347ba3557009557
diff --git a/trunk/arch/powerpc/sysdev/fsl_soc.c b/trunk/arch/powerpc/sysdev/fsl_soc.c
index 3a7054e2bb75..019657c110b6 100644
--- a/trunk/arch/powerpc/sysdev/fsl_soc.c
+++ b/trunk/arch/powerpc/sysdev/fsl_soc.c
@@ -432,7 +432,7 @@ static struct i2c_driver_device i2c_devices[] __initdata = {
 	{"dallas,ds1339",  "ds1339"},
 	{"dallas,ds1340",  "ds1340"},
 	{"stm,m41t00",     "m41t00"},
-	{"dallas,ds1374",  "rtc-ds1374"},
+	{"dallas,ds1374",  "ds1374"},
 };
 
 static int __init of_find_i2c_driver(struct device_node *node,
diff --git a/trunk/drivers/of/of_i2c.c b/trunk/drivers/of/of_i2c.c
index 715a44471617..b2ccdcbeb896 100644
--- a/trunk/drivers/of/of_i2c.c
+++ b/trunk/drivers/of/of_i2c.c
@@ -21,7 +21,6 @@ struct i2c_driver_device {
 };
 
 static struct i2c_driver_device i2c_devices[] = {
-	{ "dallas,ds1374", "rtc-ds1374" },
 };
 
 static int of_find_i2c_driver(struct device_node *node,
diff --git a/trunk/drivers/rtc/rtc-ds1374.c b/trunk/drivers/rtc/rtc-ds1374.c
index fa2d2f8b3f4d..640acd20fdde 100644
--- a/trunk/drivers/rtc/rtc-ds1374.c
+++ b/trunk/drivers/rtc/rtc-ds1374.c
@@ -42,7 +42,7 @@
 #define DS1374_REG_TCR		0x09 /* Trickle Charge */
 
 static const struct i2c_device_id ds1374_id[] = {
-	{ "rtc-ds1374", 0 },
+	{ "ds1374", 0 },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, ds1374_id);