diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
| commit | c7c4310f7fc1485925d800628bf50b3aeab535ef (patch) | |
| tree | b12aa4be0e8fb82aaaea97fb475e793e8a347c49 /include/asm-ia64 | |
| parent | 1ffd1d069ca4c5ffe16fea6175dab1b9bbb15820 (diff) | |
Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what
I've sent him, so we're very close to full integration of the MIPS
port into his sources.
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/socket.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/socket.h b/include/asm-ia64/socket.h index 877ed2eec..5d5eb7b8c 100644 --- a/include/asm-ia64/socket.h +++ b/include/asm-ia64/socket.h @@ -47,8 +47,8 @@ #define SO_DETACH_FILTER 27 #define SO_PEERNAME 28 - -#define SO_PEERNAME 28 +#define SO_TIMESTAMP 29 +#define SCM_TIMESTAMP SO_TIMESTAMP /* Nast libc5 fixup - bletch */ #if defined(__KERNEL__) |