From b3d1b03a4c60fe3e6882fd0b637d8d6127441323 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:31:11 -0300
Subject: [PATCH] --- yaml --- r: 219136 b: refs/heads/master c:
 534d4f832fc9f5db8ebcdecf0077fa7a17c6782a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a54c7e2a7f59..9b03f9befc0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc71443f4636a564ea6dbf28c014dcf681e6e554
+refs/heads/master: 534d4f832fc9f5db8ebcdecf0077fa7a17c6782a
diff --git a/trunk/drivers/media/video/saa7191.c b/trunk/drivers/media/video/saa7191.c
index a2513772196b..211fa25a1239 100644
--- a/trunk/drivers/media/video/saa7191.c
+++ b/trunk/drivers/media/video/saa7191.c
@@ -23,7 +23,6 @@
 #include <linux/i2c.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 
 #include "saa7191.h"
 
@@ -647,9 +646,25 @@ static const struct i2c_device_id saa7191_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, saa7191_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "saa7191",
-	.probe = saa7191_probe,
-	.remove = saa7191_remove,
-	.id_table = saa7191_id,
+static struct i2c_driver saa7191_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "saa7191",
+	},
+	.probe		= saa7191_probe,
+	.remove		= saa7191_remove,
+	.id_table	= saa7191_id,
 };
+
+static __init int init_saa7191(void)
+{
+	return i2c_add_driver(&saa7191_driver);
+}
+
+static __exit void exit_saa7191(void)
+{
+	i2c_del_driver(&saa7191_driver);
+}
+
+module_init(init_saa7191);
+module_exit(exit_saa7191);