Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / arch / m68k / coldfire / head.S

diff --git a/arch/m68k/coldfire/head.S b/arch/m68k/coldfire/head.S
index 73d92ea0ce65b5caca8e79f208995c034872b004..bdb472c48401d791eb6cb7ca1886dec417a1880b 100644 (file)
--- a/arch/m68k/coldfire/head.S
+++ b/arch/m68k/coldfire/head.S
@@ -280,10 +280,10 @@ _clear_bss:
        movel   %d0,m68k_cputype                /* Mark us as a ColdFire */
        movel   #MMU_COLDFIRE,%d0
        movel   %d0,m68k_mmutype
-       movel   #FPU_COLDFIRE,%d0
-       movel   %d0,m68k_fputype
-       movel   #MACH_M54XX,%d0
-       movel   %d0,m68k_machtype               /* Mark us as a 54xx machine */
+       movel   #FPUTYPE,%d0
+       movel   %d0,m68k_fputype                /* Mark FPU type */
+       movel   #MACHINE,%d0
+       movel   %d0,m68k_machtype               /* Mark machine type */
        lea     init_task,%a2                   /* Set "current" init task */
 #endif