Merge remote branch 'origin' into secretlab/next-devicetree

[pandora-kernel.git] / include / linux / i2c.h

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 6ed1d59..21067b4 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -34,6 +34,7 @@
 #include <linux/device.h>      /* for struct device */
 #include <linux/sched.h>       /* for completion */
 #include <linux/mutex.h>
+#include <linux/of.h>          /* for struct device_node */
 
 extern struct bus_type i2c_bus_type;
 
@@ -251,6 +252,9 @@ struct i2c_board_info {
        unsigned short  addr;
        void            *platform_data;
        struct dev_archdata     *archdata;
+#ifdef CONFIG_OF
+       struct device_node *of_node;
+#endif
        int             irq;
 };