Pull pnpacpi into acpica branch

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

diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 923322503e8fb5441ea5f94d55448ba3cfa88f57..d60a783e04730b53c67c1a0b6ca5f4a8e2a8dfd3 100644 (file)
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -495,10 +495,10 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-       .owner = THIS_MODULE,
-       .name = "i2c saa6588 driver",
+       .driver = {
+               .name = "i2c saa6588 driver",
+       },
        .id = -1,               /* FIXME */
-       .flags = I2C_DF_NOTIFY,
        .attach_adapter = saa6588_probe,
        .detach_client = saa6588_detach,
        .command = saa6588_command,
@@ -506,7 +506,6 @@ static struct i2c_driver driver = {
 
 static struct i2c_client client_template = {
        .name = "saa6588",
-       .flags = I2C_CLIENT_ALLOW_USE,
        .driver = &driver,
 };