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

---
 [refs]                                 |  2 +-
 trunk/drivers/media/video/tuner-core.c | 33 +++++++++++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 3102f8b94e80..ac1cba9e666a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e71ff0a48e22e06dfedffb6386cb5e519810013
+refs/heads/master: 02a2098adbe6c1053cbcd81ecb9422f4502da925
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index c4dab6cfd948..a3bb9e90f1dd 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -20,7 +20,6 @@
 #include <media/tuner-types.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
-#include <media/v4l2-i2c-drv.h>
 #include "mt20xx.h"
 #include "tda8290.h"
 #include "tea5761.h"
@@ -1176,16 +1175,32 @@ static const struct i2c_device_id tuner_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tuner_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "tuner",
-	.probe = tuner_probe,
-	.remove = tuner_remove,
-	.command = tuner_command,
-	.suspend = tuner_suspend,
-	.resume = tuner_resume,
-	.id_table = tuner_id,
+static struct i2c_driver tuner_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "tuner",
+	},
+	.probe		= tuner_probe,
+	.remove		= tuner_remove,
+	.command	= tuner_command,
+	.suspend	= tuner_suspend,
+	.resume		= tuner_resume,
+	.id_table	= tuner_id,
 };
 
+static __init int init_tuner(void)
+{
+	return i2c_add_driver(&tuner_driver);
+}
+
+static __exit void exit_tuner(void)
+{
+	i2c_del_driver(&tuner_driver);
+}
+
+module_init(init_tuner);
+module_exit(exit_tuner);
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * ---------------------------------------------------------------------------