]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
CRIS: UAPI: use generic socket.h
authorRabin Vincent <rabin@rab.in>
Sat, 28 Feb 2015 22:47:37 +0000 (23:47 +0100)
committerJesper Nilsson <jespern@axis.com>
Fri, 4 Sep 2015 22:56:47 +0000 (00:56 +0200)
commit45266922510fcd1e55df483f41be8debd5df9de8
tree6ab98a8eceb4d68e3c9125e1eff266205217efa7
parent53789d25a0603e5c836e460c758867d2071eb135
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>
arch/cris/include/asm/Kbuild
arch/cris/include/uapi/asm/socket.h [deleted file]