diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 22:38:25 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 22:38:25 +0100 |
commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /arch/ia64/include/asm/socket.h | |
parent | of: unify phandle name in struct device_node (diff) | |
parent | Linux 2.6.33-rc5 (diff) | |
download | linux-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.xz linux-0ada0a73120c28cc432bcdbac061781465c2f48f.zip |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'arch/ia64/include/asm/socket.h')
-rw-r--r-- | arch/ia64/include/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/socket.h b/arch/ia64/include/asm/socket.h index 0b0d5ff062e5..51427eaa51ba 100644 --- a/arch/ia64/include/asm/socket.h +++ b/arch/ia64/include/asm/socket.h @@ -69,4 +69,6 @@ #define SO_PROTOCOL 38 #define SO_DOMAIN 39 +#define SO_RXQ_OVFL 40 + #endif /* _ASM_IA64_SOCKET_H */ |