Merge remote-tracking branch 'wireless-next/master'

[karo-tx-linux.git] / arch / ia64 / include / uapi / asm / socket.h

diff --git a/arch/ia64/include/uapi/asm/socket.h b/arch/ia64/include/uapi/asm/socket.h
index d3358b7606819bcc733affa863febe620ad90f4b..c25302fb48d95636b59670efa423a59ff2d055c0 100644 (file)
--- a/arch/ia64/include/uapi/asm/socket.h
+++ b/arch/ia64/include/uapi/asm/socket.h
@@ -83,6 +83,8 @@
 
 #define SO_SELECT_ERR_QUEUE    45
 
-#define SO_LL                  46
+#define SO_BUSY_POLL           46
+
+#define SO_MAX_PACING_RATE     47
 
 #endif /* _ASM_IA64_SOCKET_H */