diff options
author | David S. Miller <davem@davemloft.net> | 2008-10-11 19:39:35 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-11 19:39:35 (GMT) |
commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/arm/lib/ashldi3.S | |
parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
download | linux-fsl-qoriq-56c5d900dbb8e042bfad035d18433476931d8f93.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/arm/lib/ashldi3.S')
-rw-r--r-- | arch/arm/lib/ashldi3.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/lib/ashldi3.S b/arch/arm/lib/ashldi3.S index 55e57a1..1154d92 100644 --- a/arch/arm/lib/ashldi3.S +++ b/arch/arm/lib/ashldi3.S @@ -47,3 +47,5 @@ ENTRY(__aeabi_llsl) mov al, al, lsl r2 mov pc, lr +ENDPROC(__ashldi3) +ENDPROC(__aeabi_llsl) |