diff options
| author | Rabin Vincent <rabin@rab.in> | 2015-02-28 23:47:37 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jespern@axis.com> | 2015-09-05 00:56:47 +0200 |
| commit | 45266922510fcd1e55df483f41be8debd5df9de8 (patch) | |
| tree | 6ab98a8eceb4d68e3c9125e1eff266205217efa7 /arch/cris/include/asm | |
| parent | 53789d25a0603e5c836e460c758867d2071eb135 (diff) | |
| download | linux-45266922510fcd1e55df483f41be8debd5df9de8.tar.gz linux-45266922510fcd1e55df483f41be8debd5df9de8.tar.bz2 linux-45266922510fcd1e55df483f41be8debd5df9de8.zip | |
CRIS: UAPI: use generic socket.h
CRIS' socket.h is equivalent to the asm-generic version.
Effective diff:
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-
+#ifndef __ASM_GENERIC_SOCKET_H
+#define __ASM_GENERIC_SOCKET_H
#include <asm/sockios.h>
#define SO_LINGER 13
#define SO_BSDCOMPAT 14
#define SO_REUSEPORT 15
+#ifndef SO_PASSCRED
#define SO_PASSCRED 16
#define SO_PEERCRED 17
#define SO_RCVLOWAT 18
#define SO_SNDLOWAT 19
#define SO_RCVTIMEO 20
#define SO_SNDTIMEO 21
+#endif
#define SO_SECURITY_AUTHENTICATION 22
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/include/asm')
| -rw-r--r-- | arch/cris/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 2dcd67023f27..30ed4e26ad81 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -34,6 +34,7 @@ generic-y += resource.h generic-y += sections.h generic-y += sembuf.h generic-y += siginfo.h +generic-y += socket.h generic-y += sockios.h generic-y += statfs.h generic-y += topology.h |