Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / arch / powerpc / kernel / vector.S

diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S
index 12cb90bc209c99feac3310aee41df6ffccd394c6..49ac3d6e1399a646309d3d4cdc049caedf02a721 100644 (file)
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
@@ -1,6 +1,5 @@
-#include <linux/config.h>
 #include <asm/ppc_asm.h>
-#include <asm/processor.h>
+#include <asm/reg.h>
 
 /*
  * The routines below are in assembler so we can closely control the
@@ -53,12 +52,12 @@ fpenable:
        stfd    fr31,8(r1)
        LDCONST(fr1, fpzero)
        mffs    fr31
-       mtfsf   0xff,fr1
+       MTFSF_L(fr1)
        blr
 
 fpdisable:
        mtlr    r12
-       mtfsf   0xff,fr31
+       MTFSF_L(fr31)
        lfd     fr31,8(r1)
        lfd     fr1,16(r1)
        lfd     fr0,24(r1)