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-pasemi.c | |
parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/i2c/busses/i2c-pasemi.c')
-rw-r--r-- | drivers/i2c/busses/i2c-pasemi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c index bf89eeef74e9..58e32714afb5 100644 --- a/drivers/i2c/busses/i2c-pasemi.c +++ b/drivers/i2c/busses/i2c-pasemi.c | |||
@@ -358,7 +358,7 @@ static int __devinit pasemi_smb_probe(struct pci_dev *dev, | |||
358 | } | 358 | } |
359 | 359 | ||
360 | smbus->adapter.owner = THIS_MODULE; | 360 | smbus->adapter.owner = THIS_MODULE; |
361 | snprintf(smbus->adapter.name, I2C_NAME_SIZE, | 361 | snprintf(smbus->adapter.name, sizeof(smbus->adapter.name), |
362 | "PA Semi SMBus adapter at 0x%lx", smbus->base); | 362 | "PA Semi SMBus adapter at 0x%lx", smbus->base); |
363 | smbus->adapter.class = I2C_CLASS_HWMON; | 363 | smbus->adapter.class = I2C_CLASS_HWMON; |
364 | smbus->adapter.algo = &smbus_algorithm; | 364 | smbus->adapter.algo = &smbus_algorithm; |