diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/lib | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/sha1.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/sha1.S b/arch/arm/lib/sha1.S index 8a1c67fe0544..a16fb208c841 100644 --- a/arch/arm/lib/sha1.S +++ b/arch/arm/lib/sha1.S | |||
| @@ -29,7 +29,7 @@ ENTRY(sha_transform) | |||
| 29 | stmfd sp!, {r4 - r8, lr} | 29 | stmfd sp!, {r4 - r8, lr} |
| 30 | 30 | ||
| 31 | @ for (i = 0; i < 16; i++) | 31 | @ for (i = 0; i < 16; i++) |
| 32 | @ W[i] = be32_to_cpu(in[i]); */ | 32 | @ W[i] = be32_to_cpu(in[i]); |
| 33 | 33 | ||
| 34 | #ifdef __ARMEB__ | 34 | #ifdef __ARMEB__ |
| 35 | mov r4, r0 | 35 | mov r4, r0 |