X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Fmedia%2Fv4l2-i2c-drv.h;h=7b6f06be795034d7ae64b385bfa9ef0eac4078c9;hb=d2653e92732bd3911feff6bee5e23dbf959381db;hp=547db60d36409c4376b4349b6107f5785dcc9f1e;hpb=8ffbc6559493c64d6194c92d856196fdaeb8a5fb;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index 547db60..7b6f06b 100644
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -21,19 +21,24 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifndef __V4L2_I2C_DRV_H__
+#define __V4L2_I2C_DRV_H__
+
+#include <media/v4l2-common.h>
+
 struct v4l2_i2c_driver_data {
 	const char * const name;
 	int driverid;
 	int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
-	int (*probe)(struct i2c_client *client);
+	int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
 	int (*remove)(struct i2c_client *client);
 	int (*suspend)(struct i2c_client *client, pm_message_t state);
 	int (*resume)(struct i2c_client *client);
+	int (*legacy_probe)(struct i2c_adapter *adapter);
 	int legacy_class;
 };
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static struct i2c_client_address_data addr_data;
 static struct i2c_driver v4l2_i2c_driver;
 
 
@@ -59,3 +64,5 @@ static void __exit v4l2_i2c_drv_cleanup(void)
 
 module_init(v4l2_i2c_drv_init);
 module_exit(v4l2_i2c_drv_cleanup);
+
+#endif /* __V4L2_I2C_DRV_H__ */