Merge commit 'origin/master' into next

[deliverable/linux.git] / arch / powerpc / kernel / cpu_setup_44x.S

diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index 10b4ab1008afe66914f4a5115868b4c2ef6cf038..7d606f89a8396311c5019fc65ba7fa66f6d720b3 100644 (file)
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -34,6 +34,7 @@ _GLOBAL(__setup_cpu_440grx)
        blr
 _GLOBAL(__setup_cpu_460ex)
 _GLOBAL(__setup_cpu_460gt)
+_GLOBAL(__setup_cpu_460sx)
        mflr    r4
        bl      __init_fpu_44x
        bl      __fixup_440A_mcheck