diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/arm/lib/ashrdi3.S | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/arm/lib/ashrdi3.S')
| -rw-r--r-- | arch/arm/lib/ashrdi3.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/lib/ashrdi3.S b/arch/arm/lib/ashrdi3.S index 0b31398f89b2..9f8b35572f8c 100644 --- a/arch/arm/lib/ashrdi3.S +++ b/arch/arm/lib/ashrdi3.S | |||
| @@ -47,3 +47,5 @@ ENTRY(__aeabi_lasr) | |||
| 47 | mov ah, ah, asr r2 | 47 | mov ah, ah, asr r2 |
| 48 | mov pc, lr | 48 | mov pc, lr |
| 49 | 49 | ||
| 50 | ENDPROC(__ashrdi3) | ||
| 51 | ENDPROC(__aeabi_lasr) | ||