1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 8318bd1aad00..e837f9f7fed6 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -228,16 +228,14 @@ static int tvmixer_release(struct inode *inode, struct file *file)
 
 static struct i2c_driver driver = {
 #ifdef I2C_PEC
-        .owner           = THIS_MODULE,
-#endif
+        .driver = {
+                .name    = "tv card mixer driver",
+        },
+#else
         .name            = "tv card mixer driver",
+#endif
         .id              = I2C_DRIVERID_TVMIXER,
-#ifdef I2C_DF_DUMMY
-        .flags           = I2C_DF_DUMMY,
-#else
-        .flags           = I2C_DF_NOTIFY,
         .detach_adapter  = tvmixer_adapters,
-#endif
         .attach_adapter  = tvmixer_adapters,
         .detach_client   = tvmixer_clients,
 };