projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'clockevents/fixes' of git://git.linaro.org/people/daniel.lezcano/linux...
[linux-drm-fsl-dcu.git]
/
arch
/
parisc
/
include
/
uapi
/
asm
/
socket.h
diff --git
a/arch/parisc/include/uapi/asm/socket.h
b/arch/parisc/include/uapi/asm/socket.h
index 7c614d01f1fa42df36a23b3633f6d6ae7d47aa6a..f33113a6141e7540da2195cc72469152edfbecf2 100644
(file)
--- a/
arch/parisc/include/uapi/asm/socket.h
+++ b/
arch/parisc/include/uapi/asm/socket.h
@@
-1,5
+1,5
@@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
+#ifndef _
UAPI_
ASM_SOCKET_H
+#define _
UAPI_
ASM_SOCKET_H
#include <asm/sockios.h>
#include <asm/sockios.h>
@@
-77,9
+77,4
@@
#define SO_MAX_PACING_RATE 0x4048
#define SO_MAX_PACING_RATE 0x4048
-/* O_NONBLOCK clashes with the bits used for socket types. Therefore we
- * have to define SOCK_NONBLOCK to a different value here.
- */
-#define SOCK_NONBLOCK 0x40000000
-
-#endif /* _ASM_SOCKET_H */
+#endif /* _UAPI_ASM_SOCKET_H */