Merge branch 'for-3.13/logitech' into for-next

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

diff --git a/arch/h8300/include/uapi/asm/socket.h b/arch/h8300/include/uapi/asm/socket.h
index a38d38a6520bfcc58fb3b4729cb1e38ecc37aa90..9490758c5e2bac1aa4375063a713473221234d97 100644 (file)
--- a/arch/h8300/include/uapi/asm/socket.h
+++ b/arch/h8300/include/uapi/asm/socket.h
@@ -74,6 +74,6 @@
 
 #define SO_SELECT_ERR_QUEUE    45
 
-#define SO_LL                  46
+#define SO_BUSY_POLL           46
 
 #endif /* _ASM_SOCKET_H */