diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 13:25:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 13:25:16 +1100 |
| commit | 171c69846b9c9c30081e3165c474c6b42d8e3726 (patch) | |
| tree | acbe54e255538beca8c1258bc5de1fe5d3ba4c46 /arch/powerpc/lib/memcpy_power7.S | |
| parent | 3f43b18abbc10c6127922bd34f3f768c379a0a68 (diff) | |
| parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/pci/pci-driver.c
Diffstat (limited to 'arch/powerpc/lib/memcpy_power7.S')
| -rw-r--r-- | arch/powerpc/lib/memcpy_power7.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/memcpy_power7.S b/arch/powerpc/lib/memcpy_power7.S index 2ff5c142f87b..0830587df16e 100644 --- a/arch/powerpc/lib/memcpy_power7.S +++ b/arch/powerpc/lib/memcpy_power7.S @@ -653,4 +653,4 @@ _GLOBAL(memcpy_power7) 15: addi r1,r1,STACKFRAMESIZE ld r3,-STACKFRAMESIZE+STK_REG(R31)(r1) b exit_vmx_copy /* tail call optimise */ -#endif /* CONFiG_ALTIVEC */ +#endif /* CONFIG_ALTIVEC */ |