From 0eda1b00caf478aa3cb52937339783f06171e750 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:29:53 -0300
Subject: [PATCH] --- yaml --- r: 219135 b: refs/heads/master c:
 dc71443f4636a564ea6dbf28c014dcf681e6e554 h: refs/heads/master i:   219133:
 b63a84a3a08ec9899fddaec35907a45275687b3d   219131:
 c3ce60bd09bd9a7aa71da8e35da257fa5f34e849   219127:
 dfd7cd2d58b1b3e214517d58585abb06793d41b8   219119:
 a586daafc0a30909bbc74a01ff767f521818b8c8   219103:
 9b4139befb24ba5fe117a4740532b535009e8519   219071:
 155b562370f3317f68dd4c8e3d330f0c67294245   219007:
 2d1ec67f16320171ef935c6dac2e63d1c33553fd   218879:
 a10a7152c2558d8238484e8de8ebeffe8e6236c8   218623:
 b377a332f4e96139fd39d86fdd61c50c10e3704f   218111:
 66d32e678627b59e2c45bde8db417154cf85e6d0   217087:
 3db2d0f183aa5c1026c1c4fab28098498e7e4d79 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/adv7175.c | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 296f71bc1018..a54c7e2a7f59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5b2c49386fe6a62bf5d2513c99d4e70b10c03db
+refs/heads/master: dc71443f4636a564ea6dbf28c014dcf681e6e554
diff --git a/trunk/drivers/media/video/adv7175.c b/trunk/drivers/media/video/adv7175.c
index f1ba0d742c65..f318b51448b3 100644
--- a/trunk/drivers/media/video/adv7175.c
+++ b/trunk/drivers/media/video/adv7175.c
@@ -30,11 +30,9 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");
 MODULE_AUTHOR("Dave Perks");
@@ -376,9 +374,25 @@ static const struct i2c_device_id adv7175_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, adv7175_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "adv7175",
-	.probe = adv7175_probe,
-	.remove = adv7175_remove,
-	.id_table = adv7175_id,
+static struct i2c_driver adv7175_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "adv7175",
+	},
+	.probe		= adv7175_probe,
+	.remove		= adv7175_remove,
+	.id_table	= adv7175_id,
 };
+
+static __init int init_adv7175(void)
+{
+	return i2c_add_driver(&adv7175_driver);
+}
+
+static __exit void exit_adv7175(void)
+{
+	i2c_del_driver(&adv7175_driver);
+}
+
+module_init(init_adv7175);
+module_exit(exit_adv7175);