Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / include / linux / sm501.h

diff --git a/include/linux/sm501.h b/include/linux/sm501.h
index 6ea39007c8a3ef0a96bb923152f67ad6e83ceee1..214f93209b8c0fb847971b41f0b5ea242b241e8a 100644 (file)
--- a/include/linux/sm501.h
+++ b/include/linux/sm501.h
@@ -86,11 +86,19 @@ struct sm501_platdata_fb {
        struct sm501_platdata_fbsub     *fb_pnl;
 };
 
-/* gpio i2c */
+/* gpio i2c
+ *
+ * Note, we have to pass in the bus number, as the number used will be
+ * passed to the i2c-gpio driver's platform_device.id, subsequently used
+ * to register the i2c bus.
+*/
 
 struct sm501_platdata_gpio_i2c {
+       unsigned int            bus_num;
        unsigned int            pin_sda;
        unsigned int            pin_scl;
+       int                     udelay;
+       int                     timeout;
 };
 
 /* sm501_initdata
@@ -156,7 +164,7 @@ struct sm501_platdata {
        struct sm501_platdata_fb        *fb;
 
        int                              flags;
-       unsigned                         gpio_base;
+       int                              gpio_base;
 
        int     (*get_power)(struct device *dev);
        int     (*set_power)(struct device *dev, unsigned int on);