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

1 files changed, 3 insertions, 10 deletions

diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 7ffa2e9a9bf3..a51c7bd96618 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -226,23 +226,16 @@ static int saa5249_detach(struct i2c_client *client)
         return 0;
 }
 
-static int saa5249_command(struct i2c_client *device,
-                             unsigned int cmd, void *arg)
-{
-        return -EINVAL;
-}
-
 /* new I2C driver support */
 
 static struct i2c_driver i2c_driver_videotext = 
 {
-        .owner          = THIS_MODULE,
-        .name           = IF_NAME,              /* name */
+        .driver = {
+                .name   = IF_NAME,              /* name */
+        },
         .id             = I2C_DRIVERID_SAA5249, /* in i2c.h */
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = saa5249_probe,
         .detach_client  = saa5249_detach,
-        .command        = saa5249_command
 };
 
 static struct i2c_client client_template = {