From 97e9e1be1777b5f27509046bd776e2fb2b5e8939 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:41:23 -0300
Subject: [PATCH] --- yaml --- r: 219143 b: refs/heads/master c:
 e2c52ba68029a2e68d8f4970597147844772cb2b h: refs/heads/master i:   219141:
 31b74e5c9c6af073b2926167eb686a117f213039   219139:
 e922320f7c379d3bc27bb8551d3b971362825d06   219135:
 0eda1b00caf478aa3cb52937339783f06171e750 v: v3

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

diff --git a/[refs] b/[refs]
index d0070f5c1736..8ecd57831ba0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b9f80af0c2678e854725640a15b2c7a386ac185
+refs/heads/master: e2c52ba68029a2e68d8f4970597147844772cb2b
diff --git a/trunk/drivers/media/video/tea6420.c b/trunk/drivers/media/video/tea6420.c
index 49dafc5e1e2f..5ea840401f21 100644
--- a/trunk/drivers/media/video/tea6420.c
+++ b/trunk/drivers/media/video/tea6420.c
@@ -34,7 +34,6 @@
 #include <linux/i2c.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 #include "tea6420.h"
 
 MODULE_AUTHOR("Michael Hunold <michael@mihu.de>");
@@ -157,9 +156,25 @@ static const struct i2c_device_id tea6420_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tea6420_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "tea6420",
-	.probe = tea6420_probe,
-	.remove = tea6420_remove,
-	.id_table = tea6420_id,
+static struct i2c_driver tea6420_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "tea6420",
+	},
+	.probe		= tea6420_probe,
+	.remove		= tea6420_remove,
+	.id_table	= tea6420_id,
 };
+
+static __init int init_tea6420(void)
+{
+	return i2c_add_driver(&tea6420_driver);
+}
+
+static __exit void exit_tea6420(void)
+{
+	i2c_del_driver(&tea6420_driver);
+}
+
+module_init(init_tea6420);
+module_exit(exit_tea6420);