Merge branch 'master' into csb1725

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

diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 23bad3fd6dc5fdef5d773819c9d6b482a27593cd..fe8ef6419f831f36d52347ff275d8c96d4dc8c5f 100644 (file)
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -31,12 +31,10 @@
 #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-ctrls.h>
-#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("wm8775 driver");
 MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
@@ -281,9 +279,25 @@ static const struct i2c_device_id wm8775_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, wm8775_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-       .name = "wm8775",
-       .probe = wm8775_probe,
-       .remove = wm8775_remove,
-       .id_table = wm8775_id,
+static struct i2c_driver wm8775_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "wm8775",
+       },
+       .probe          = wm8775_probe,
+       .remove         = wm8775_remove,
+       .id_table       = wm8775_id,
 };
+
+static __init int init_wm8775(void)
+{
+       return i2c_add_driver(&wm8775_driver);
+}
+
+static __exit void exit_wm8775(void)
+{
+       i2c_del_driver(&wm8775_driver);
+}
+
+module_init(init_wm8775);
+module_exit(exit_wm8775);