diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/i2c/busses/i2c-ixp4xx.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/i2c/busses/i2c-ixp4xx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ixp4xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c index 08e89b83984a..069ed7f3b395 100644 --- a/drivers/i2c/busses/i2c-ixp4xx.c +++ b/drivers/i2c/busses/i2c-ixp4xx.c | |||
| @@ -127,7 +127,7 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev) | |||
| 127 | drv_data->adapter.id = I2C_HW_B_IXP4XX; | 127 | drv_data->adapter.id = I2C_HW_B_IXP4XX; |
| 128 | drv_data->adapter.class = I2C_CLASS_HWMON; | 128 | drv_data->adapter.class = I2C_CLASS_HWMON; |
| 129 | strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name, | 129 | strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name, |
| 130 | I2C_NAME_SIZE); | 130 | sizeof(drv_data->adapter.name)); |
| 131 | drv_data->adapter.algo_data = &drv_data->algo_data; | 131 | drv_data->adapter.algo_data = &drv_data->algo_data; |
| 132 | 132 | ||
| 133 | drv_data->adapter.dev.parent = &plat_dev->dev; | 133 | drv_data->adapter.dev.parent = &plat_dev->dev; |