diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /include/asm-sparc/socket.h | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'include/asm-sparc/socket.h')
| -rw-r--r-- | include/asm-sparc/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc/socket.h b/include/asm-sparc/socket.h index c1154e3ecfdf..09575b608adb 100644 --- a/include/asm-sparc/socket.h +++ b/include/asm-sparc/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 | ||