diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 16:46:25 -0400 |
| commit | 489f7ab6c18cdd64a2d444e056d60a0e722f4ad7 (patch) | |
| tree | 2c7ed6a0042dc15c91ece08c5a3866f610ddca6d /arch/arm | |
| parent | b322b7816908487c08b89b72f838174c37d8c836 (diff) | |
| parent | 82d27b2b2f3a80ffa7759a49b9cba39e47df476e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
trivial: remove the trivial patch monkey's name from SubmittingPatches
trivial: Fix a typo in comment of addrconf_dad_start()
trivial: usb: fix missing space typo in doc
trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
trivial: Remove the hyphen from git commands
trivial: fix ETIMEOUT -> ETIMEDOUT typos
trivial: Kconfig: .ko is normally not included in module names
trivial: SubmittingPatches: fix typo
trivial: Documentation/dell_rbu.txt: fix typos
trivial: Fix Pavel's address in MAINTAINERS
trivial: ftrace:fix description of trace directory
trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
trivial: input/misc: Fix typo in Kconfig
trivial: fix grammo in bus_for_each_dev() kerneldoc
trivial: rbtree.txt: fix rb_entry() parameters in sample code
trivial: spelling fix in ppc code comments
trivial: fix typo in bio_alloc kernel doc
trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
trivial: Miscellaneous documentation typo fixes
trivial: fix typo milisecond/millisecond for documentation and source comments.
...
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720_ssp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index 28cf36967977..506a5e5a9ad5 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c | |||
| @@ -54,7 +54,7 @@ EXPORT_SYMBOL(jornada_ssp_reverse); | |||
| 54 | * timeout after <timeout> rounds. Needs mcu running before its called. | 54 | * timeout after <timeout> rounds. Needs mcu running before its called. |
| 55 | * | 55 | * |
| 56 | * returns : %mcu output on success | 56 | * returns : %mcu output on success |
| 57 | * : %-ETIMEOUT on timeout | 57 | * : %-ETIMEDOUT on timeout |
| 58 | */ | 58 | */ |
| 59 | int jornada_ssp_byte(u8 byte) | 59 | int jornada_ssp_byte(u8 byte) |
| 60 | { | 60 | { |
| @@ -82,7 +82,7 @@ EXPORT_SYMBOL(jornada_ssp_byte); | |||
| 82 | * jornada_ssp_inout - decide if input is command or trading byte | 82 | * jornada_ssp_inout - decide if input is command or trading byte |
| 83 | * | 83 | * |
| 84 | * returns : (jornada_ssp_byte(byte)) on success | 84 | * returns : (jornada_ssp_byte(byte)) on success |
| 85 | * : %-ETIMEOUT on timeout failure | 85 | * : %-ETIMEDOUT on timeout failure |
| 86 | */ | 86 | */ |
| 87 | int jornada_ssp_inout(u8 byte) | 87 | int jornada_ssp_inout(u8 byte) |
| 88 | { | 88 | { |