diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/i2c/algos/i2c-algo-pca.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-pca.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-pca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index 2b9a8f54bb2c..4ca9cf9cde73 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c | |||
| @@ -343,7 +343,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, | |||
| 343 | 343 | ||
| 344 | ret = curmsg; | 344 | ret = curmsg; |
| 345 | out: | 345 | out: |
| 346 | DEB1("}}} transfered %d/%d messages. " | 346 | DEB1("}}} transferred %d/%d messages. " |
| 347 | "status is %#04x. control is %#04x\n", | 347 | "status is %#04x. control is %#04x\n", |
| 348 | curmsg, num, pca_status(adap), | 348 | curmsg, num, pca_status(adap), |
| 349 | pca_get_con(adap)); | 349 | pca_get_con(adap)); |