diff options
author | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
commit | 6a33fc8cacfc7fac829c72bd321868be7e72f609 (patch) | |
tree | ca8572f214a30c4743b731b4ab2809a980b78369 /arch/arm/mm/proc-xsc3.S | |
parent | 3bd957978bb50390bb07678bc4c125989e9a81a2 (diff) | |
parent | 2746a7c272a3242f919fa2fd5a5f2d9f8a41173a (diff) | |
download | linux-stable-6a33fc8cacfc7fac829c72bd321868be7e72f609.tar.gz linux-stable-6a33fc8cacfc7fac829c72bd321868be7e72f609.tar.bz2 linux-stable-6a33fc8cacfc7fac829c72bd321868be7e72f609.zip |
Merge tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
From Jason Cooper:
mvebu fixes-non-critical for v3.12
- dove
- fix section mismatch (all callers are already _init, so it's just a space
issue)
* tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu:
ARM: dove: fix missing __init section of dove_mpp_gpio_mode
+ Linux 3.11-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mm/proc-xsc3.S')
-rw-r--r-- | arch/arm/mm/proc-xsc3.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index e8efd83b6f25..dc1645890042 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S @@ -446,8 +446,6 @@ ENTRY(cpu_xsc3_do_resume) ENDPROC(cpu_xsc3_do_resume) #endif - __CPUINIT - .type __xsc3_setup, #function __xsc3_setup: mov r0, #PSR_F_BIT|PSR_I_BIT|SVC_MODE |