diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 13:23:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 13:23:20 -0800 |
| commit | 031f2dcd7075e218e74dd7f942ad015cf82dffab (patch) | |
| tree | d7ee06c0fcfb2e841230e38de704dd0fed60bd7e /drivers/i2c/busses/i2c-powermac.c | |
| parent | fix the "remove task_ppid_nr_ns" commit (diff) | |
| parent | i2c-sibyte: Fix an error path (diff) | |
| download | linux-dev-031f2dcd7075e218e74dd7f942ad015cf82dffab.tar.xz linux-dev-031f2dcd7075e218e74dd7f942ad015cf82dffab.zip | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-sibyte: Fix an error path
i2c: Driver IDs are optional
i2c: Spelling fixes
i2c-omap: Fix NULL pointer dereferencing
Diffstat (limited to 'drivers/i2c/busses/i2c-powermac.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-powermac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index 0ab4f2627c26..7813127649a1 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c @@ -94,7 +94,7 @@ static s32 i2c_powermac_smbus_xfer( struct i2c_adapter* adap, break; /* Note that these are broken vs. the expected smbus API where - * on reads, the lenght is actually returned from the function, + * on reads, the length is actually returned from the function, * but I think the current API makes no sense and I don't want * any driver that I haven't verified for correctness to go * anywhere near a pmac i2c bus anyway ... |