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-at91.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-at91.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-at91.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c index 9c8b6d5eaec9..c09b036913bd 100644 --- a/drivers/i2c/busses/i2c-at91.c +++ b/drivers/i2c/busses/i2c-at91.c @@ -135,7 +135,7 @@ static int xfer_write(struct i2c_adapter *adap, unsigned char *buf, int length) * Generic i2c master transfer entrypoint. * * Note: We do not use Atmel's feature of storing the "internal device address". - * Instead the "internal device address" has to be written using a seperate + * Instead the "internal device address" has to be written using a separate * i2c message. * http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2004-September/024411.html */ |