Merge commit 'v2.6.30-rc5' into next

1 files changed, 0 insertions, 39 deletions

diff --git a/include/asm-m32r/sigcontext.h b/include/asm-m32r/sigcontext.h
deleted file mode 100644
index da4a9c36d09b..000000000000
--- a/include/asm-m32r/sigcontext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _ASM_M32R_SIGCONTEXT_H
-#define _ASM_M32R_SIGCONTEXT_H
-
-struct sigcontext {
-        /* CPU registers */
-        /* Saved main processor registers. */
-        unsigned long sc_r4;
-        unsigned long sc_r5;
-        unsigned long sc_r6;
-        struct pt_regs *sc_pt_regs;
-        unsigned long sc_r0;
-        unsigned long sc_r1;
-        unsigned long sc_r2;
-        unsigned long sc_r3;
-        unsigned long sc_r7;
-        unsigned long sc_r8;
-        unsigned long sc_r9;
-        unsigned long sc_r10;
-        unsigned long sc_r11;
-        unsigned long sc_r12;
-
-        /* Saved main processor status and miscellaneous context registers. */
-        unsigned long sc_acc0h;
-        unsigned long sc_acc0l;
-        unsigned long sc_acc1h; /* ISA_DSP_LEVEL2 only */
-        unsigned long sc_acc1l; /* ISA_DSP_LEVEL2 only */
-        unsigned long sc_psw;
-        unsigned long sc_bpc;           /* saved PC for TRAP syscalls */
-        unsigned long sc_bbpsw;
-        unsigned long sc_bbpc;
-        unsigned long sc_spu;           /* saved user stack */
-        unsigned long sc_fp;
-        unsigned long sc_lr;            /* saved PC for JL syscalls */
-        unsigned long sc_spi;           /* saved kernel stack */
-
-        unsigned long   oldmask;
-};
-
-#endif  /* _ASM_M32R_SIGCONTEXT_H */