From 130c769a266e749acf7c7911a0211badab6a6df4 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:01:48 -0300
Subject: [PATCH] --- yaml --- r: 219118 b: refs/heads/master c:
 720d916e64a1bd70948b0a7e97ba0fff0e2f43d1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8f836e98b55d..461a6c3d2129 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51e868466d60e0aea1b5d1d822bf30fdcde24dd4
+refs/heads/master: 720d916e64a1bd70948b0a7e97ba0fff0e2f43d1
diff --git a/trunk/drivers/media/video/saa717x.c b/trunk/drivers/media/video/saa717x.c
index 45f8bfc1342e..b6172c2c517e 100644
--- a/trunk/drivers/media/video/saa717x.c
+++ b/trunk/drivers/media/video/saa717x.c
@@ -39,7 +39,6 @@
 #include <linux/i2c.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
-#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("Philips SAA717x audio/video decoder driver");
 MODULE_AUTHOR("K. Ohta, T. Adachi, Hans Verkuil");
@@ -1366,9 +1365,25 @@ static const struct i2c_device_id saa717x_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, saa717x_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "saa717x",
-	.probe = saa717x_probe,
-	.remove = saa717x_remove,
-	.id_table = saa717x_id,
+static struct i2c_driver saa717x_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "saa717x",
+	},
+	.probe		= saa717x_probe,
+	.remove		= saa717x_remove,
+	.id_table	= saa717x_id,
 };
+
+static __init int init_saa717x(void)
+{
+	return i2c_add_driver(&saa717x_driver);
+}
+
+static __exit void exit_saa717x(void)
+{
+	i2c_del_driver(&saa717x_driver);
+}
+
+module_init(init_saa717x);
+module_exit(exit_saa717x);