diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /include/asm-m68knommu/ptrace.h | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-m68knommu/ptrace.h')
| -rw-r--r-- | include/asm-m68knommu/ptrace.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-m68knommu/ptrace.h b/include/asm-m68knommu/ptrace.h index 1e19c457de7d..47258e86e8c4 100644 --- a/include/asm-m68knommu/ptrace.h +++ b/include/asm-m68knommu/ptrace.h | |||
| @@ -46,11 +46,9 @@ struct pt_regs { | |||
| 46 | #else | 46 | #else |
| 47 | unsigned short sr; | 47 | unsigned short sr; |
| 48 | unsigned long pc; | 48 | unsigned long pc; |
| 49 | #ifndef NO_FORMAT_VEC | ||
| 50 | unsigned format : 4; /* frame format specifier */ | 49 | unsigned format : 4; /* frame format specifier */ |
| 51 | unsigned vector : 12; /* vector offset */ | 50 | unsigned vector : 12; /* vector offset */ |
| 52 | #endif | 51 | #endif |
| 53 | #endif | ||
| 54 | }; | 52 | }; |
| 55 | 53 | ||
| 56 | /* | 54 | /* |