diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-03 17:29:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-03 17:29:05 +0100 |
| commit | 8e9c4aa4e7bd600d30e15ec82be9b670a1ec3da9 (patch) | |
| tree | 3b19eb54c684e36feab568078018dea31c43a79f /arch/tile/kernel/unaligned.c | |
| parent | d60336e2f136287de821901d4a1b56179a0f7b69 (diff) | |
| parent | 1d73ad298d1bfeee5d77c19e5cd667c551e30632 (diff) | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl
Conflicts:
sound/soc/fsl/fsl_ssi.c
Diffstat (limited to 'arch/tile/kernel/unaligned.c')
| -rw-r--r-- | arch/tile/kernel/unaligned.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/unaligned.c b/arch/tile/kernel/unaligned.c index b425fb6a480d..b030b4e78845 100644 --- a/arch/tile/kernel/unaligned.c +++ b/arch/tile/kernel/unaligned.c @@ -551,8 +551,8 @@ static tilegx_bundle_bits jit_x1_bnezt(int ra, int broff) /* * This function generates unalign fixup JIT. * - * We fist find unalign load/store instruction's destination, source - * reguisters: ra, rb and rd. and 3 scratch registers by calling + * We first find unalign load/store instruction's destination, source + * registers: ra, rb and rd. and 3 scratch registers by calling * find_regs(...). 3 scratch clobbers should not alias with any register * used in the fault bundle. Then analyze the fault bundle to determine * if it's a load or store, operand width, branch or address increment etc. |