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-viapro.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/i2c/busses/i2c-viapro.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-viapro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c index 03c5fc868548..7a2bc06304fc 100644 --- a/drivers/i2c/busses/i2c-viapro.c +++ b/drivers/i2c/busses/i2c-viapro.c | |||
| @@ -404,7 +404,7 @@ found: | |||
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | vt596_adapter.dev.parent = &pdev->dev; | 406 | vt596_adapter.dev.parent = &pdev->dev; |
| 407 | snprintf(vt596_adapter.name, I2C_NAME_SIZE, | 407 | snprintf(vt596_adapter.name, sizeof(vt596_adapter.name), |
| 408 | "SMBus Via Pro adapter at %04x", vt596_smba); | 408 | "SMBus Via Pro adapter at %04x", vt596_smba); |
| 409 | 409 | ||
| 410 | vt596_pdev = pci_dev_get(pdev); | 410 | vt596_pdev = pci_dev_get(pdev); |