diff options
author | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
commit | 1ad1f10cd915744bbe52b19423653b38287d827d (patch) | |
tree | ae072aace36b45a55d80b8cbf1b6d92523a88ea0 /arch/avr32/include/asm/socket.h | |
parent | 08e3daff217059c84c360cc71212686e0a7995af (diff) | |
parent | 2b876f95d03e226394b5d360c86127cbefaf614b (diff) | |
download | kernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.tar.gz kernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.tar.xz kernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.zip |
Merge branch 'master' into next
Diffstat (limited to 'arch/avr32/include/asm/socket.h')
-rw-r--r-- | arch/avr32/include/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/avr32/include/asm/socket.h b/arch/avr32/include/asm/socket.h index fe863f9794d..c8d1fae4947 100644 --- a/arch/avr32/include/asm/socket.h +++ b/arch/avr32/include/asm/socket.h @@ -60,4 +60,6 @@ #define SO_PROTOCOL 38 #define SO_DOMAIN 39 +#define SO_RXQ_OVFL 40 + #endif /* __ASM_AVR32_SOCKET_H */ |