Merge branch 'cleanup' into for-linus

Conflicts: arch/arm/mach-imx/mach-imx27_visstrim_m10.c
2012-10-04 23:01:28 +01:00
parent 0d7614f09c 9fc31ddc70
commit 43a60c1792
6 changed files with 6 additions and 70 deletions
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -59,7 +59,9 @@ struct thread_info {
 	__u32			syscall;	/* syscall number */
 	__u8			used_cp[16];	/* thread used copro */
 	unsigned long		tp_value;
+#ifdef CONFIG_CRUNCH
 	struct crunch_state	crunchstate;
+#endif
 	union fp_state		fpstate __attribute__((aligned(8)));
 	union vfp_state		vfpstate;
 #ifdef CONFIG_ARM_THUMBEE