Commit 3ec3634e authored by Linus Torvalds's avatar Linus Torvalds

Update scx200 i2c driver for 'name' move.

parent b8a6c393
...@@ -84,9 +84,7 @@ static struct i2c_adapter scx200_i2c_ops = { ...@@ -84,9 +84,7 @@ static struct i2c_adapter scx200_i2c_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.id = I2C_HW_B_VELLE, .id = I2C_HW_B_VELLE,
.algo_data = &scx200_i2c_data, .algo_data = &scx200_i2c_data,
.dev = {
.name = "NatSemi SCx200 I2C", .name = "NatSemi SCx200 I2C",
},
}; };
int scx200_i2c_init(void) int scx200_i2c_init(void)
...@@ -112,7 +110,7 @@ int scx200_i2c_init(void) ...@@ -112,7 +110,7 @@ int scx200_i2c_init(void)
if (i2c_bit_add_bus(&scx200_i2c_ops) < 0) { if (i2c_bit_add_bus(&scx200_i2c_ops) < 0) {
printk(KERN_ERR NAME ": adapter %s registration failed\n", printk(KERN_ERR NAME ": adapter %s registration failed\n",
scx200_i2c_ops.dev.name); scx200_i2c_ops.name);
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment