diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-19 09:55:58 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-19 09:56:17 +0400 |
| commit | 68d2cf25d39324c54b5e42de7915c623a0917abe (patch) | |
| tree | ff1291450d7e6630bc77ec1363c3db8d74fa58b0 /arch/arm/plat-omap/mcbsp.c | |
| parent | 176fcc5c5f0131504a55e1e1d35389c49a9177c2 (diff) | |
| parent | 5d2cd90922c778908bd0cd669e572a5b5eafd737 (diff) | |
| download | linux-68d2cf25d39324c54b5e42de7915c623a0917abe.tar.xz | |
Merge branch 'perf/urgent' into perf/core
Merge reason: we'll be queueing up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
| -rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index d598d9fd65ac..5587acf0eb2c 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -1103,7 +1103,7 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) /* resend */ return -1; } else { - /* wait for recieve confirmation */ + /* wait for receive confirmation */ int attemps = 0; while (!(MCBSP_READ(mcbsp, SPCR1) & RRDY)) { if (attemps++ > 1000) { |