Merge with Linus' kernel.

[linux-2.6] / drivers / acorn / char / pcf8583.c

diff --git a/drivers/acorn/char/pcf8583.c b/drivers/acorn/char/pcf8583.c
index befc9469b4f2e3de5c3546004a0e641fc11f6dbc..9b49f316ae923a6a46478bab22f7d376a940d783 100644 (file)
--- a/drivers/acorn/char/pcf8583.c
+++ b/drivers/acorn/char/pcf8583.c
@@ -257,7 +257,9 @@ pcf8583_command(struct i2c_client *client, unsigned int cmd, void *arg)
 }
 
 static struct i2c_driver pcf8583_driver = {
-       .name           = "PCF8583",
+       .driver = {
+               .name   = "PCF8583",
+       },
        .id             = I2C_DRIVERID_PCF8583,
        .attach_adapter = pcf8583_probe,
        .detach_client  = pcf8583_detach,