diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 14:26:05 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 14:26:05 -0400 |
| commit | ac8d513a6801c8636922ccf4f30211810c9a56ce (patch) | |
| tree | 83ba584487a6a612c8fcf2563c28c0263df35ba2 /arch/parisc/include/asm/socket.h | |
| parent | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (diff) | |
| parent | 99bc47067910f7070e65ee318a6dd79a2371f1e5 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/parisc/include/asm/socket.h')
| -rw-r--r-- | arch/parisc/include/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/socket.h b/arch/parisc/include/asm/socket.h index 885472bf7b78..960b1e5d8e16 100644 --- a/arch/parisc/include/asm/socket.h +++ b/arch/parisc/include/asm/socket.h | |||
| @@ -24,6 +24,8 @@ | |||
| 24 | #define SO_RCVTIMEO 0x1006 | 24 | #define SO_RCVTIMEO 0x1006 |
| 25 | #define SO_ERROR 0x1007 | 25 | #define SO_ERROR 0x1007 |
| 26 | #define SO_TYPE 0x1008 | 26 | #define SO_TYPE 0x1008 |
| 27 | #define SO_PROTOCOL 0x1028 | ||
| 28 | #define SO_DOMAIN 0x1029 | ||
| 27 | #define SO_PEERNAME 0x2000 | 29 | #define SO_PEERNAME 0x2000 |
| 28 | 30 | ||
| 29 | #define SO_NO_CHECK 0x400b | 31 | #define SO_NO_CHECK 0x400b |