Merge branch 'pnp' into release

[linux-2.6-omap-h63xx.git] / include / asm-m32r / user.h

diff --git a/include/asm-m32r/user.h b/include/asm-m32r/user.h
index 2ffd0c65a78281592eeffb9b63a80dbacae89309..03b3c11c2aff2ba5b2580d96c2c534d65b1f074d 100644 (file)
--- a/include/asm-m32r/user.h
+++ b/include/asm-m32r/user.h
@@ -1,14 +1,7 @@
 #ifndef _ASM_M32R_USER_H
 #define _ASM_M32R_USER_H
 
-/* $Id$ */
-
-/* orig : sh 2.4.18
- * mod  : remove fpu registers
- */
-
 #include <linux/types.h>
-#include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
 
@@ -45,7 +38,7 @@ struct user {
        unsigned long   start_data;             /* data starting address */
        unsigned long   start_stack;            /* stack starting address */
        long int        signal;                 /* signal causing core dump */
-       struct regs *   u_ar0;                  /* help gdb find registers */
+       unsigned long   u_ar0;                  /* help gdb find registers */
        unsigned long   magic;                  /* identifies a core file */
        char            u_comm[32];             /* user command name */
 };