Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index e908f917c8d2..c4ba3742f5c7 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -167,10 +167,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
 }
 
 static struct i2c_driver driver = {
-        .owner  = THIS_MODULE,
-        .name   = "tea6420",
+        .driver = {
+                .name   = "tea6420",
+        },
         .id     = I2C_DRIVERID_TEA6420,
-        .flags  = I2C_DF_NOTIFY,
         .attach_adapter = attach,
         .detach_client  = detach,
         .command        = command,