From ca4c9e7bb2c33fd4fa0d7414b238a876c7f08d16 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Wed, 2 Nov 2011 15:44:42 +1000
Subject: [PATCH] --- yaml --- r: 279707 b: refs/heads/master c:
 479badc364b52774d77264aaf81f4d4b375a4a97 h: refs/heads/master i:   279705:
 bccc8b2c51d05b049aa0daaf483c739f71760c3e   279703:
 d20c8322b1f00554ff981a3e6a645d5782716fa4 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/m68k/include/asm/sigcontext.h | 4 ----
 trunk/arch/m68k/include/asm/ucontext.h   | 4 ----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 3d583cac2d74..d212e1c0bb67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46729d0eb301f689272c64a9417e7b40038f42a6
+refs/heads/master: 479badc364b52774d77264aaf81f4d4b375a4a97
diff --git a/trunk/arch/m68k/include/asm/sigcontext.h b/trunk/arch/m68k/include/asm/sigcontext.h
index a29dd74a17cb..523db2a51cf3 100644
--- a/trunk/arch/m68k/include/asm/sigcontext.h
+++ b/trunk/arch/m68k/include/asm/sigcontext.h
@@ -15,11 +15,7 @@ struct sigcontext {
 	unsigned long  sc_pc;
 	unsigned short sc_formatvec;
 #ifndef __uClinux__
-# ifdef __mcoldfire__
-	unsigned long  sc_fpregs[2][2];	/* room for two fp registers */
-# else
 	unsigned long  sc_fpregs[2*3];  /* room for two fp registers */
-# endif
 	unsigned long  sc_fpcntl[3];
 	unsigned char  sc_fpstate[216];
 #endif
diff --git a/trunk/arch/m68k/include/asm/ucontext.h b/trunk/arch/m68k/include/asm/ucontext.h
index 00dcc5176c57..e4e22669edc0 100644
--- a/trunk/arch/m68k/include/asm/ucontext.h
+++ b/trunk/arch/m68k/include/asm/ucontext.h
@@ -7,11 +7,7 @@ typedef greg_t gregset_t[NGREG];
 
 typedef struct fpregset {
 	int f_fpcntl[3];
-#ifdef __mcoldfire__
-	int f_fpregs[8][2];
-#else
 	int f_fpregs[8*3];
-#endif
 } fpregset_t;
 
 struct mcontext {