From 39a528e31d65da8af33fc2020b92a544ec6508c1 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 15 Jun 2009 18:01:48 +0200
Subject: [PATCH] --- yaml --- r: 151034 b: refs/heads/master c:
 c52cf01f5b35d77b2a918c319e22567de5c3c15f h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/i2c/i2c-core.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a8bc0b88e63b..7a432cef84d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa1b2ca4fa271f9300a764b9d505a027156f749b
+refs/heads/master: c52cf01f5b35d77b2a918c319e22567de5c3c15f
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index 635c488262c0..5ed622ee65c3 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -29,7 +29,6 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/idr.h>
-#include <linux/platform_device.h>
 #include <linux/mutex.h>
 #include <linux/completion.h>
 #include <linux/hardirq.h>
@@ -451,16 +450,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
 
 	mutex_lock(&core_lock);
 
-	/* Add the adapter to the driver core.
-	 * If the parent pointer is not set up,
-	 * we add this adapter to the host bus.
-	 */
-	if (adap->dev.parent == NULL) {
-		adap->dev.parent = &platform_bus;
-		pr_debug("I2C adapter driver [%s] forgot to specify "
-			 "physical device\n", adap->name);
-	}
-
 	/* Set default timeout to 1 second if not already set */
 	if (adap->timeout == 0)
 		adap->timeout = HZ;