Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / include / linux / i2c-algo-pcf.h

diff --git a/include/linux/i2c-algo-pcf.h b/include/linux/i2c-algo-pcf.h
index 74fb6f8..0f91a95 100644 (file)
--- a/include/linux/i2c-algo-pcf.h
+++ b/include/linux/i2c-algo-pcf.h
@@ -31,11 +31,10 @@ struct i2c_algo_pcf_data {
        int  (*getpcf) (void *data, int ctl);
        int  (*getown) (void *data);
        int  (*getclock) (void *data);
-       void (*waitforpin) (void);
+       void (*waitforpin) (void *data);
 
-       /* local settings */
-       int udelay;
-       int timeout;
+       void (*xfer_begin) (void *data);
+       void (*xfer_end) (void *data);
 
        /* Multi-master lost arbitration back-off delay (msecs)
         * This should be set by the bus adapter or knowledgable client