---

yaml
---
r: 16699
b: refs/heads/master
c: e1c489b
h: refs/heads/master
i:
  16697: 1982e7d
  16695: b5203f1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d45d204f0c3daa01a393dfe81415573f9459506a
+refs/heads/master: e1c489b0e4fbb1687f8227fe78b4769c123768c1

trunk/drivers/i2c/busses/i2c-isa.c

@@ -98,7 +98,7 @@ int i2c_isa_add_driver(struct i2c_driver *driver)
 	res = driver_register(&driver->driver);
 	if (res)
 		return res;
-	dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->name);
+	dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->driver.name);
 
 	/* Now look for clients */
 	driver->attach_adapter(&isa_adapter);
@@ -129,7 +129,7 @@ int i2c_isa_del_driver(struct i2c_driver *driver)
 
 	/* Get the driver off the core list */
 	driver_unregister(&driver->driver);
-	dev_dbg(&isa_adapter.dev, "Driver %s unregistered\n", driver->name);
+	dev_dbg(&isa_adapter.dev, "Driver %s unregistered\n", driver->driver.name);
 
 	return 0;
 }
@@ -174,7 +174,7 @@ static void __exit i2c_isa_exit(void)
 	list_for_each_safe(item, _n, &isa_adapter.clients) {
 		client = list_entry(item, struct i2c_client, list);
 		dev_err(&isa_adapter.dev, "Driver %s still has an active "
-			"ISA client at 0x%x\n", client->driver->name,
+			"ISA client at 0x%x\n", client->driver->driver.name,
 			client->addr);
 	}
 	if (client != NULL)