diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 15:22:08 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 15:22:08 +0400 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /arch/cris/arch-v32/lib/checksumcopy.S | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
| download | linux-fb8231a8b139035476f2a8aaac837d0099b66dad.tar.xz | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'arch/cris/arch-v32/lib/checksumcopy.S')
| -rw-r--r-- | arch/cris/arch-v32/lib/checksumcopy.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/cris/arch-v32/lib/checksumcopy.S b/arch/cris/arch-v32/lib/checksumcopy.S index 21aabe91489b..54e209f18b06 100644 --- a/arch/cris/arch-v32/lib/checksumcopy.S +++ b/arch/cris/arch-v32/lib/checksumcopy.S @@ -9,6 +9,7 @@ */ .globl csum_partial_copy_nocheck + .type csum_partial_copy_nocheck,@function csum_partial_copy_nocheck: ;; r10 - src @@ -89,3 +90,5 @@ _do_byte: move.b $r9,[$r11] ret move.d $r13,$r10 + + .size csum_partial_copy_nocheck, . - csum_partial_copy_nocheck |