Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / media / video / ks0127.c

diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c
index 94734828053b92bbec041df93638c3ef9625802e..afa91182b44828bb4a25b1f75b5137e539f7af9d 100644 (file)
--- a/drivers/media/video/ks0127.c
+++ b/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);