From cfbe7ee62300732255c0868f9afe8af12674cc2c Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 24 Oct 2010 18:16:57 +0200
Subject: [PATCH] --- yaml --- r: 215599 b: refs/heads/master c:
 d582963a027fd63f8dfc97a0bf3654d4380e34ce h: refs/heads/master i:   215597:
 e5199766c278a798e5edb71c7b377af82fecf591   215595:
 9a596004184ba18c6ac9e00a674b5abb09787c82   215591:
 da11c0382e59bf5db6cda35f76fac4d27e931454   215583:
 74b7a638079f429970d5e60516701713f47b2ec2 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/i2c.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cfcbb2ffe9d7..f4d43216fb5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 323584436db0cb05286425d4dfd9516fce88487f
+refs/heads/master: d582963a027fd63f8dfc97a0bf3654d4380e34ce
diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h
index 4bae0b72ed3c..9391a491501a 100644
--- a/trunk/include/linux/i2c.h
+++ b/trunk/include/linux/i2c.h
@@ -387,7 +387,6 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
 static inline int i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter)
 {
 	return adapter->dev.parent != NULL
-		&& adapter->dev.parent->bus == &i2c_bus_type
 		&& adapter->dev.parent->type == &i2c_adapter_type;
 }