[PATCH] i2c: Drop i2c_driver.{owner,name}, 3 of 11

[pandora-kernel.git] / drivers / hwmon / w83781d.c

diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index a78929f..fd1a59c 100644 (file)
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -269,16 +269,20 @@ static struct w83781d_data *w83781d_update_device(struct device *dev);
 static void w83781d_init_client(struct i2c_client *client);
 
 static struct i2c_driver w83781d_driver = {
-       .owner = THIS_MODULE,
-       .name = "w83781d",
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "w83781d",
+       },
        .id = I2C_DRIVERID_W83781D,
        .attach_adapter = w83781d_attach_adapter,
        .detach_client = w83781d_detach_client,
 };
 
 static struct i2c_driver w83781d_isa_driver = {
-       .owner = THIS_MODULE,
-       .name = "w83781d-isa",
+       .driver = {
+               .owner = THIS_MODULE,
+               .name = "w83781d-isa",
+       },
        .attach_adapter = w83781d_isa_attach_adapter,
        .detach_client = w83781d_detach_client,
 };
@@ -1011,7 +1015,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
        
        if (is_isa)
                if (!request_region(address, W83781D_EXTENT,
-                                   w83781d_isa_driver.name)) {
+                                   w83781d_isa_driver.driver.name)) {
                        dev_dbg(&adapter->dev, "Request of region "
                                "0x%x-0x%x for w83781d failed\n", address,
                                address + W83781D_EXTENT - 1);