[PATCH] x86/powerpc make hardirq_ctx and softirq_ctx __read_mostly

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

diff --git a/include/asm-arm/fpstate.h b/include/asm-arm/fpstate.h
index 6246bf83627d3c7c5304cdc47d974daec61f8702..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;
        /*