From da9ea6caeb517ee2f3e806605a9bb1986fdb1763 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:32:24 -0300
Subject: [PATCH] --- yaml --- r: 219137 b: refs/heads/master c:
 3f4172007aaa9fb717f7b7db8edf4b9d73aa4e7f h: refs/heads/master i:   219135:
 0eda1b00caf478aa3cb52937339783f06171e750 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/media/video/bt856.c | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9b03f9befc0a..9c2710129570 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 534d4f832fc9f5db8ebcdecf0077fa7a17c6782a
+refs/heads/master: 3f4172007aaa9fb717f7b7db8edf4b9d73aa4e7f
diff --git a/trunk/drivers/media/video/bt856.c b/trunk/drivers/media/video/bt856.c
index ae3337392505..a43059d4c799 100644
--- a/trunk/drivers/media/video/bt856.c
+++ b/trunk/drivers/media/video/bt856.c
@@ -34,11 +34,9 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("Brooktree-856A video encoder driver");
 MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -262,9 +260,25 @@ static const struct i2c_device_id bt856_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, bt856_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "bt856",
-	.probe = bt856_probe,
-	.remove = bt856_remove,
-	.id_table = bt856_id,
+static struct i2c_driver bt856_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "bt856",
+	},
+	.probe		= bt856_probe,
+	.remove		= bt856_remove,
+	.id_table	= bt856_id,
 };
+
+static __init int init_bt856(void)
+{
+	return i2c_add_driver(&bt856_driver);
+}
+
+static __exit void exit_bt856(void)
+{
+	i2c_del_driver(&bt856_driver);
+}
+
+module_init(init_bt856);
+module_exit(exit_bt856);