x86: include/asm-x86/pgalloc.h/bitops.h: checkpatch cleanups - formatting only

[linux-2.6] / include / media / v4l2-i2c-drv.h

diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index 547db60d36409c4376b4349b6107f5785dcc9f1e..9e4bab2769151fd51eed09d77bbbb52b2a76068d 100644 (file)
--- a/include/media/v4l2-i2c-drv.h
+++ b/include/media/v4l2-i2c-drv.h
@@ -21,6 +21,11 @@
  * 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;
@@ -29,11 +34,11 @@ struct v4l2_i2c_driver_data {
        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__ */