Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / include / asm-arm / fpstate.h

diff --git a/include/asm-arm/fpstate.h b/include/asm-arm/fpstate.h
index f7430e3aa55d2eb2f5601839b5d92f5da4e0da7b..132c3c5628b2a4b4d5be60bee7f1a41f04e627d0 100644 (file)
--- a/include/asm-arm/fpstate.h
+++ b/include/asm-arm/fpstate.h
@@ -11,7 +11,6 @@
 #ifndef __ASM_ARM_FPSTATE_H
 #define __ASM_ARM_FPSTATE_H
 
-#include <linux/config.h>
 
 #ifndef __ASSEMBLY__
 
@@ -26,7 +25,9 @@
 
 struct vfp_hard_struct {
        __u64 fpregs[16];
+#if __LINUX_ARM_ARCH__ < 6
        __u32 fpmx_state;
+#endif
        __u32 fpexc;
        __u32 fpscr;
        /*
@@ -55,8 +56,10 @@ struct fp_soft_struct {
        unsigned int save[FP_SOFT_SIZE];                /* undefined information */
 };
 
+#define IWMMXT_SIZE    0x98
+
 struct iwmmxt_struct {
-       unsigned int save[0x98/sizeof(int) + 1];
+       unsigned int save[IWMMXT_SIZE / sizeof(unsigned int)];
 };
 
 union fp_state {