Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / mm / proc-sa110.S

diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index a201eb04b5e1a6327d1a5375c00b669ee7fc439c..5aa8d59c2e8546675d132fc48306c89b2d9380da 100644 (file)
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -156,7 +156,7 @@ ENTRY(cpu_sa110_set_pte_ext)
 #endif
        mov     pc, lr
 
-       __INIT
+       __CPUINIT
 
        .type   __sa110_setup, #function
 __sa110_setup: