diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-15 02:31:54 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-15 02:31:54 +0200 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /arch/arm/lib/copy_page.S | |
| parent | powerpc: Fix CHRP PCI config access for indirect_pci (diff) | |
| parent | Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | linux-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.xz linux-6dc6472581f693b5fc95aebedf67b4960fb85cf0.zip | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'arch/arm/lib/copy_page.S')
| -rw-r--r-- | arch/arm/lib/copy_page.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S index 666c99cc0744..6ae04db1ca4f 100644 --- a/arch/arm/lib/copy_page.S +++ b/arch/arm/lib/copy_page.S @@ -44,3 +44,4 @@ ENTRY(copy_page) PLD( ldmeqia r1!, {r3, r4, ip, lr} ) PLD( beq 2b ) ldmfd sp!, {r4, pc} @ 3 +ENDPROC(copy_page) |