diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/asm-ia64/unwind.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/asm-ia64/unwind.h')
| -rw-r--r-- | include/asm-ia64/unwind.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/unwind.h b/include/asm-ia64/unwind.h index 5df0276b0493..1af3875f1a57 100644 --- a/include/asm-ia64/unwind.h +++ b/include/asm-ia64/unwind.h | |||
| @@ -81,7 +81,7 @@ struct unw_frame_info { | |||
| 81 | struct unw_ireg { | 81 | struct unw_ireg { |
| 82 | unsigned long *loc; | 82 | unsigned long *loc; |
| 83 | struct unw_ireg_nat { | 83 | struct unw_ireg_nat { |
| 84 | long type : 3; /* enum unw_nat_type */ | 84 | unsigned long type : 3; /* enum unw_nat_type */ |
| 85 | signed long off : 61; /* NaT word is at loc+nat.off */ | 85 | signed long off : 61; /* NaT word is at loc+nat.off */ |
| 86 | } nat; | 86 | } nat; |
| 87 | } r4, r5, r6, r7; | 87 | } r4, r5, r6, r7; |