diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 14:27:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 14:27:56 +0100 |
| commit | 0cab71e7014dc73a84e1d14d9b02e39c48241580 (patch) | |
| tree | 17b25202f70b62d43bca6bdf6ca9dc61f3daf0aa /arch/tile/kernel/unaligned.c | |
| parent | 7d5f880b46f222ff83a76fd36b01f5a59bf32122 (diff) | |
| parent | 3e2bd64d243ff0f3dc08c49ff218fed42ee9d981 (diff) | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
Conflicts:
drivers/spi/spi-s3c64xx.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. |