From 09e908d03cb54e2fd61dd7d4ecfc435820848ad4 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:40:07 -0300
Subject: [PATCH] --- yaml --- r: 219142 b: refs/heads/master c:
 5b9f80af0c2678e854725640a15b2c7a386ac185 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d009ca48aacc..d0070f5c1736 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff6e5422e4a6db93e05c8d29c1db79540f1f1707
+refs/heads/master: 5b9f80af0c2678e854725640a15b2c7a386ac185
diff --git a/trunk/drivers/media/video/tda7432.c b/trunk/drivers/media/video/tda7432.c
index 80f1cee23fa5..3941f954daf4 100644
--- a/trunk/drivers/media/video/tda7432.c
+++ b/trunk/drivers/media/video/tda7432.c
@@ -36,7 +36,6 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/i2c-addr.h>
-#include <media/v4l2-i2c-drv.h>
 
 #ifndef VIDEO_AUDIO_BALANCE
 # define VIDEO_AUDIO_BALANCE 32
@@ -472,9 +471,25 @@ static const struct i2c_device_id tda7432_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tda7432_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "tda7432",
-	.probe = tda7432_probe,
-	.remove = tda7432_remove,
-	.id_table = tda7432_id,
+static struct i2c_driver tda7432_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "tda7432",
+	},
+	.probe		= tda7432_probe,
+	.remove		= tda7432_remove,
+	.id_table	= tda7432_id,
 };
+
+static __init int init_tda7432(void)
+{
+	return i2c_add_driver(&tda7432_driver);
+}
+
+static __exit void exit_tda7432(void)
+{
+	i2c_del_driver(&tda7432_driver);
+}
+
+module_init(init_tda7432);
+module_exit(exit_tda7432);