Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / media / video / adv7175.c

diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index f1ba0d7..f318b51 100644 (file)
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -30,11 +30,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("Analog Devices ADV7175 video encoder driver");
 MODULE_AUTHOR("Dave Perks");
@@ -376,9 +374,25 @@ static const struct i2c_device_id adv7175_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, adv7175_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-       .name = "adv7175",
-       .probe = adv7175_probe,
-       .remove = adv7175_remove,
-       .id_table = adv7175_id,
+static struct i2c_driver adv7175_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "adv7175",
+       },
+       .probe          = adv7175_probe,
+       .remove         = adv7175_remove,
+       .id_table       = adv7175_id,
 };
+
+static __init int init_adv7175(void)
+{
+       return i2c_add_driver(&adv7175_driver);
+}
+
+static __exit void exit_adv7175(void)
+{
+       i2c_del_driver(&adv7175_driver);
+}
+
+module_init(init_adv7175);
+module_exit(exit_adv7175);