diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-25 10:40:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-25 10:40:10 -0500 |
| commit | 2e31add2a7e2a15d07f592c21ba35870fa9a1d1f (patch) | |
| tree | 814e2c70fb5528f108114c0da6e5a1e219e6a0e1 /arch/mips/include/asm/ptrace.h | |
| parent | d639bab8da86d330493487e8c0fea8ca31f53427 (diff) | |
| parent | 17581ad812a9abb0182260374ef2e52d4a808a64 (diff) | |
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'arch/mips/include/asm/ptrace.h')
| -rw-r--r-- | arch/mips/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index 1f30d16d4669..ce47118e52b7 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h | |||
| @@ -105,7 +105,7 @@ struct pt_watch_regs { | |||
| 105 | enum pt_watch_style style; | 105 | enum pt_watch_style style; |
| 106 | union { | 106 | union { |
| 107 | struct mips32_watch_regs mips32; | 107 | struct mips32_watch_regs mips32; |
| 108 | struct mips32_watch_regs mips64; | 108 | struct mips64_watch_regs mips64; |
| 109 | }; | 109 | }; |
| 110 | }; | 110 | }; |
| 111 | 111 | ||