diff options
author | 2010-05-19 10:12:41 -0700 | |
---|---|---|
committer | 2010-05-19 10:12:41 -0700 | |
commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /arch/m68k/include/asm/sigcontext.h | |
parent | Input: add keypad driver for keys interfaced to TCA6416 (diff) | |
parent | Linus 2.6.34 (diff) | |
download | linux-dev-8d0bc2b456103a34c11e01305cd1aed1cde579e5.tar.xz linux-dev-8d0bc2b456103a34c11e01305cd1aed1cde579e5.zip |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'arch/m68k/include/asm/sigcontext.h')
-rw-r--r-- | arch/m68k/include/asm/sigcontext.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h index 1320eaa4cc2a..a29dd74a17cb 100644 --- a/arch/m68k/include/asm/sigcontext.h +++ b/arch/m68k/include/asm/sigcontext.h @@ -17,13 +17,11 @@ struct sigcontext { #ifndef __uClinux__ # ifdef __mcoldfire__ unsigned long sc_fpregs[2][2]; /* room for two fp registers */ - unsigned long sc_fpcntl[3]; - unsigned char sc_fpstate[16+6*8]; # else unsigned long sc_fpregs[2*3]; /* room for two fp registers */ +# endif unsigned long sc_fpcntl[3]; unsigned char sc_fpstate[216]; -# endif #endif }; |