From 2f68336f173ed34053a9923a30175e77fcd8dcb5 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:53:43 -0300
Subject: [PATCH] --- yaml --- r: 219153 b: refs/heads/master c:
 22ac5f67a6c3626bd2834c9095cbc1e56c5abbce h: refs/heads/master i:   219151:
 618291df68cf68808f807ccaac0f65655a00248d v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/go7007/s2250-board.c | 27 +++++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1b3213c54a07..88f90098c68d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 978cff6bf3ccb2b4ca37108d64d295f5993e713e
+refs/heads/master: 22ac5f67a6c3626bd2834c9095cbc1e56c5abbce
diff --git a/trunk/drivers/staging/go7007/s2250-board.c b/trunk/drivers/staging/go7007/s2250-board.c
index db8ac51279f9..e7736a915530 100644
--- a/trunk/drivers/staging/go7007/s2250-board.c
+++ b/trunk/drivers/staging/go7007/s2250-board.c
@@ -23,7 +23,6 @@
 #include <linux/slab.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-common.h>
-#include <media/v4l2-i2c-drv.h>
 #include <media/v4l2-subdev.h>
 #include "go7007-priv.h"
 
@@ -675,9 +674,25 @@ static const struct i2c_device_id s2250_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, s2250_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "s2250",
-	.probe = s2250_probe,
-	.remove = s2250_remove,
-	.id_table = s2250_id,
+static struct i2c_driver s2250_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "s2250",
+	},
+	.probe		= s2250_probe,
+	.remove		= s2250_remove,
+	.id_table	= s2250_id,
 };
+
+static __init int init_s2250(void)
+{
+	return i2c_add_driver(&s2250_driver);
+}
+
+static __exit void exit_s2250(void)
+{
+	i2c_del_driver(&s2250_driver);
+}
+
+module_init(init_s2250);
+module_exit(exit_s2250);