diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /include/asm-i386/socket.h | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'include/asm-i386/socket.h')
| -rw-r--r-- | include/asm-i386/socket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h index 802ae76195b7..5755d57c4e95 100644 --- a/include/asm-i386/socket.h +++ b/include/asm-i386/socket.h | |||
| @@ -48,5 +48,6 @@ | |||
| 48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
| 49 | 49 | ||
| 50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
| 51 | #define SO_PASSSEC 34 | ||
| 51 | 52 | ||
| 52 | #endif /* _ASM_SOCKET_H */ | 53 | #endif /* _ASM_SOCKET_H */ |