diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-07 02:43:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-07 02:43:04 -0700 |
| commit | f0975ce872bb3f5f6c86837bc84c1e9dfd76e87c (patch) | |
| tree | 9578db69ebff882287ff51860ee1c5244332c84e /include/asm-alpha/socket.h | |
| parent | 88e1f06c27cc74daececa9e6ad4337cbbfb626a9 (diff) | |
| parent | 8d34d4fde2dfa67d29298f4bb4c636c3ee1914aa (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/asm-alpha/socket.h')
| -rw-r--r-- | include/asm-alpha/socket.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-alpha/socket.h b/include/asm-alpha/socket.h index 88912c4c8931..d00259d3dc78 100644 --- a/include/asm-alpha/socket.h +++ b/include/asm-alpha/socket.h @@ -55,20 +55,4 @@ #define SO_SECURITY_ENCRYPTION_TRANSPORT 20 #define SO_SECURITY_ENCRYPTION_NETWORK 21 -/* Nast libc5 fixup - bletch */ -#if defined(__KERNEL__) -/* Socket types. */ -#define SOCK_STREAM 1 /* stream (connection) socket */ -#define SOCK_DGRAM 2 /* datagram (conn.less) socket */ -#define SOCK_RAW 3 /* raw socket */ -#define SOCK_RDM 4 /* reliably-delivered message */ -#define SOCK_SEQPACKET 5 /* sequential packet socket */ -#define SOCK_PACKET 10 /* linux specific way of */ - /* getting packets at the dev */ - /* level. For writing rarp and */ - /* other similar things on the */ - /* user level. */ -#define SOCK_MAX (SOCK_PACKET+1) -#endif - #endif /* _ASM_SOCKET_H */ |