1 files changed, 21 insertions, 6 deletions

diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index c3e96f070973..2ddd68cc3f93 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -34,7 +34,6 @@
 #include <media/rds.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 
 
 /* insmod options */
@@ -530,9 +529,25 @@ static const struct i2c_device_id saa6588_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, saa6588_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-        .name = "saa6588",
-        .probe = saa6588_probe,
-        .remove = saa6588_remove,
-        .id_table = saa6588_id,
+static struct i2c_driver saa6588_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "saa6588",
+        },
+        .probe          = saa6588_probe,
+        .remove         = saa6588_remove,
+        .id_table       = saa6588_id,
 };
+
+static __init int init_saa6588(void)
+{
+        return i2c_add_driver(&saa6588_driver);
+}
+
+static __exit void exit_saa6588(void)
+{
+        i2c_del_driver(&saa6588_driver);
+}
+
+module_init(init_saa6588);
+module_exit(exit_saa6588);