Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-omap-h63xx.git] / drivers / media / video / saa7191.c

diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index cbca896e8cfaa81dfcfaaa39fa665527a040b8ba..41f6f05a0436b947b7402ed0eeb007dd64b4fb1a 100644 (file)
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -788,10 +788,10 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
 }
 
 static struct i2c_driver i2c_driver_saa7191 = {
-       .owner          = THIS_MODULE,
-       .name           = "saa7191",
+       .driver = {
+               .name   = "saa7191",
+       },
        .id             = I2C_DRIVERID_SAA7191,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = saa7191_probe,
        .detach_client  = saa7191_detach,
        .command        = saa7191_command