From c75e5a3579a9ea15a1f59d2d772a62f507262ddd Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 3 May 2010 16:44:35 +0900
Subject: [PATCH] --- yaml --- r: 191948 b: refs/heads/master c:
 e12ef7f02ed56af4f84a5743fa268901c52729bf h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-s3c2416/s3c2416.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 63aee7d8d4db..7da840aec518 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6e1ec7f69950864ff8d992da6d929b1444f7cb3
+refs/heads/master: e12ef7f02ed56af4f84a5743fa268901c52729bf
diff --git a/trunk/arch/arm/mach-s3c2416/s3c2416.c b/trunk/arch/arm/mach-s3c2416/s3c2416.c
index 6165dc7010fe..ad5a63a40d6e 100644
--- a/trunk/arch/arm/mach-s3c2416/s3c2416.c
+++ b/trunk/arch/arm/mach-s3c2416/s3c2416.c
@@ -50,6 +50,8 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 
+#include <plat/iic-core.h>
+
 static struct map_desc s3c2416_iodesc[] __initdata = {
 	IODESC_ENT(WATCHDOG),
 	IODESC_ENT(CLKPWR),
@@ -80,6 +82,10 @@ int __init s3c2416_init(void)
 	s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
 	s3c_device_wdt.resource[1].end   = IRQ_S3C2443_WDT;
 
+	/* the i2c devices are directly compatible with s3c2440 */
+	s3c_i2c0_setname("s3c2440-i2c");
+	s3c_i2c1_setname("s3c2440-i2c");
+
 	return sysdev_register(&s3c2416_sysdev);
 }