diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /include/asm-parisc/compat.h | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-parisc/compat.h')
| -rw-r--r-- | include/asm-parisc/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-parisc/compat.h b/include/asm-parisc/compat.h index ca0eac647a05..7630d1ad2391 100644 --- a/include/asm-parisc/compat.h +++ b/include/asm-parisc/compat.h | |||
| @@ -24,7 +24,7 @@ typedef u16 compat_nlink_t; | |||
| 24 | typedef u16 compat_ipc_pid_t; | 24 | typedef u16 compat_ipc_pid_t; |
| 25 | typedef s32 compat_daddr_t; | 25 | typedef s32 compat_daddr_t; |
| 26 | typedef u32 compat_caddr_t; | 26 | typedef u32 compat_caddr_t; |
| 27 | typedef u32 compat_timer_t; | 27 | typedef s32 compat_timer_t; |
| 28 | 28 | ||
| 29 | typedef s32 compat_int_t; | 29 | typedef s32 compat_int_t; |
| 30 | typedef s32 compat_long_t; | 30 | typedef s32 compat_long_t; |