diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
| commit | 826509f8110049663799bc20f2b5b6170e2f78ca (patch) | |
| tree | 9d8823cf283592625b882125b4b13988f2934cc6 /include/asm-v850/socket.h | |
| parent | d992895ba2b27cf5adf1ba0ad6d27662adc54c5e (diff) | |
| parent | c530cfb1ce1e8f230744c3f3bd86771f50725053 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'include/asm-v850/socket.h')
| -rw-r--r-- | include/asm-v850/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-v850/socket.h b/include/asm-v850/socket.h index 213b852af53e..0240d366a0a4 100644 --- a/include/asm-v850/socket.h +++ b/include/asm-v850/socket.h | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | #define SO_BROADCAST 6 | 14 | #define SO_BROADCAST 6 |
| 15 | #define SO_SNDBUF 7 | 15 | #define SO_SNDBUF 7 |
| 16 | #define SO_RCVBUF 8 | 16 | #define SO_RCVBUF 8 |
| 17 | #define SO_SNDBUFFORCE 32 | ||
| 18 | #define SO_RCVBUFFORCE 33 | ||
| 17 | #define SO_KEEPALIVE 9 | 19 | #define SO_KEEPALIVE 9 |
| 18 | #define SO_OOBINLINE 10 | 20 | #define SO_OOBINLINE 10 |
| 19 | #define SO_NO_CHECK 11 | 21 | #define SO_NO_CHECK 11 |