From 31b74e5c9c6af073b2926167eb686a117f213039 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:38:54 -0300
Subject: [PATCH] --- yaml --- r: 219141 b: refs/heads/master c:
 ff6e5422e4a6db93e05c8d29c1db79540f1f1707 h: refs/heads/master i:   219139:
 e922320f7c379d3bc27bb8551d3b971362825d06 v: v3

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

diff --git a/[refs] b/[refs]
index b2762e582829..d009ca48aacc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd5882c531717090e3e3501be0a2c2ebe5ec79c6
+refs/heads/master: ff6e5422e4a6db93e05c8d29c1db79540f1f1707
diff --git a/trunk/drivers/media/video/saa7110.c b/trunk/drivers/media/video/saa7110.c
index 3bca744e43af..7913f93979b8 100644
--- a/trunk/drivers/media/video/saa7110.c
+++ b/trunk/drivers/media/video/saa7110.c
@@ -36,7 +36,6 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("Philips SAA7110 video decoder driver");
 MODULE_AUTHOR("Pauline Middelink");
@@ -505,9 +504,25 @@ static const struct i2c_device_id saa7110_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, saa7110_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "saa7110",
-	.probe = saa7110_probe,
-	.remove = saa7110_remove,
-	.id_table = saa7110_id,
+static struct i2c_driver saa7110_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "saa7110",
+	},
+	.probe		= saa7110_probe,
+	.remove		= saa7110_remove,
+	.id_table	= saa7110_id,
 };
+
+static __init int init_saa7110(void)
+{
+	return i2c_add_driver(&saa7110_driver);
+}
+
+static __exit void exit_saa7110(void)
+{
+	i2c_del_driver(&saa7110_driver);
+}
+
+module_init(init_saa7110);
+module_exit(exit_saa7110);