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; }