Merge branch 'acpi-misc'

[linux-2.6-microblaze.git] / include / linux / i2c.h

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index fc55ea4..5662265 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -344,7 +344,7 @@ const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
 
 static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)
 {
-       struct device * const dev = container_of(kobj, struct device, kobj);
+       struct device * const dev = kobj_to_dev(kobj);
        return to_i2c_client(dev);
 }