Merge with Linus' kernel.

[powerpc.git] / drivers / media / video / tveeprom.c

diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d8b5a17..8ac4cb8 100644 (file)
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -779,7 +779,6 @@ tveeprom_detach_client (struct i2c_client *client)
 
 static struct i2c_driver i2c_driver_tveeprom = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = "tveeprom",
        },
        .id             = I2C_DRIVERID_TVEEPROM,