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-sparc64 | |
| 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-sparc64')
| -rw-r--r-- | include/asm-sparc64/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h index 865547a23908..59987dad3359 100644 --- a/include/asm-sparc64/socket.h +++ b/include/asm-sparc64/socket.h | |||
| @@ -29,6 +29,8 @@ | |||
| 29 | 29 | ||
| 30 | #define SO_SNDBUF 0x1001 | 30 | #define SO_SNDBUF 0x1001 |
| 31 | #define SO_RCVBUF 0x1002 | 31 | #define SO_RCVBUF 0x1002 |
| 32 | #define SO_SNDBUFFORCE 0x100a | ||
| 33 | #define SO_RCVBUFFORCE 0x100b | ||
| 32 | #define SO_ERROR 0x1007 | 34 | #define SO_ERROR 0x1007 |
| 33 | #define SO_TYPE 0x1008 | 35 | #define SO_TYPE 0x1008 |
| 34 | 36 | ||