diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /arch/arm/lib | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
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 ff6ece487ffc..67c2bf4774b7 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 |