Merge ARM fixes

1 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 71e50d3e492f..9428092017e3 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -125,7 +125,12 @@ struct i2c_driver {
          * it must be freed here.
          */
         int (*detach_client)(struct i2c_client *);
-        
+
+        /* driver model interfaces that don't relate to enumeration  */
+        void (*shutdown)(struct i2c_client *);
+        int (*suspend)(struct i2c_client *, pm_message_t mesg);
+        int (*resume)(struct i2c_client *);
+
         /* a ioctl like command that can be used to perform specific functions
          * with the device.
          */