diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/cris/include/asm/socket.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/cris/include/asm/socket.h')
| -rw-r--r-- | arch/cris/include/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/include/asm/socket.h b/arch/cris/include/asm/socket.h index 45ec49bdb7b..1a4a61909ca 100644 --- a/arch/cris/include/asm/socket.h +++ b/arch/cris/include/asm/socket.h | |||
| @@ -62,6 +62,8 @@ | |||
| 62 | #define SO_PROTOCOL 38 | 62 | #define SO_PROTOCOL 38 |
| 63 | #define SO_DOMAIN 39 | 63 | #define SO_DOMAIN 39 |
| 64 | 64 | ||
| 65 | #define SO_RXQ_OVFL 40 | ||
| 66 | |||
| 65 | #endif /* _ASM_SOCKET_H */ | 67 | #endif /* _ASM_SOCKET_H */ |
| 66 | 68 | ||
| 67 | 69 | ||