From 618291df68cf68808f807ccaac0f65655a00248d Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:51:04 -0300
Subject: [PATCH] --- yaml --- r: 219151 b: refs/heads/master c:
 da48a8dd32ad09f3ba04b4949ce9d58467859d96 h: refs/heads/master i:   219149:
 3a3eb03d62a1ebfb6e01b2f766db39dba5f849ac   219147:
 5f4ebaa64d85d93ba0fc923ba37a75a26b0ad6d6   219143:
 97e9e1be1777b5f27509046bd776e2fb2b5e8939   219135:
 0eda1b00caf478aa3cb52937339783f06171e750 v: v3

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

diff --git a/[refs] b/[refs]
index b52be963ef17..b675af2bb14c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9611802b6230bd584b667790cd7844c3414a172
+refs/heads/master: da48a8dd32ad09f3ba04b4949ce9d58467859d96
diff --git a/trunk/drivers/media/video/ks0127.c b/trunk/drivers/media/video/ks0127.c
index 94734828053b..afa91182b448 100644
--- a/trunk/drivers/media/video/ks0127.c
+++ b/trunk/drivers/media/video/ks0127.c
@@ -43,7 +43,6 @@
 #include <linux/slab.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 #include "ks0127.h"
 
 MODULE_DESCRIPTION("KS0127 video decoder driver");
@@ -712,9 +711,25 @@ static const struct i2c_device_id ks0127_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, ks0127_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "ks0127",
-	.probe = ks0127_probe,
-	.remove = ks0127_remove,
-	.id_table = ks0127_id,
+static struct i2c_driver ks0127_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "ks0127",
+	},
+	.probe		= ks0127_probe,
+	.remove		= ks0127_remove,
+	.id_table	= ks0127_id,
 };
+
+static __init int init_ks0127(void)
+{
+	return i2c_add_driver(&ks0127_driver);
+}
+
+static __exit void exit_ks0127(void)
+{
+	i2c_del_driver(&ks0127_driver);
+}
+
+module_init(init_ks0127);
+module_exit(exit_ks0127);