From 7061eda23f9a64dace90a5cd1810f7865b04bd35 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:08:09 -0300
Subject: [PATCH] --- yaml --- r: 219121 b: refs/heads/master c:
 ef2ac770cd69909f6387d8a9e045cb41b46aedcf h: refs/heads/master i:   219119:
 a586daafc0a30909bbc74a01ff767f521818b8c8 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/media/video/ov7670.c | 27 +++++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 48792975c8b8..54a06515cda6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb595b516030bb0c356386e6c8de8569f1966e5b
+refs/heads/master: ef2ac770cd69909f6387d8a9e045cb41b46aedcf
diff --git a/trunk/drivers/media/video/ov7670.c b/trunk/drivers/media/video/ov7670.c
index c141d2e604e3..089013ec987a 100644
--- a/trunk/drivers/media/video/ov7670.c
+++ b/trunk/drivers/media/video/ov7670.c
@@ -19,7 +19,6 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-mediabus.h>
-#include <media/v4l2-i2c-drv.h>
 
 
 MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>");
@@ -1496,9 +1495,25 @@ static const struct i2c_device_id ov7670_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ov7670_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "ov7670",
-	.probe = ov7670_probe,
-	.remove = ov7670_remove,
-	.id_table = ov7670_id,
+static struct i2c_driver ov7670_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "ov7670",
+	},
+	.probe		= ov7670_probe,
+	.remove		= ov7670_remove,
+	.id_table	= ov7670_id,
 };
+
+static __init int init_ov7670(void)
+{
+	return i2c_add_driver(&ov7670_driver);
+}
+
+static __exit void exit_ov7670(void)
+{
+	i2c_del_driver(&ov7670_driver);
+}
+
+module_init(init_ov7670);
+module_exit(exit_ov7670);