Skip to content

Commit

Permalink
CRIS: UAPI: use generic socket.h
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Jesper Nilsson <[email protected]>
  • Loading branch information
vitkyrka authored and Jesper Nilsson committed Sep 4, 2015
1 parent 53789d2 commit 4526692
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 92 deletions.
1 change: 1 addition & 0 deletions arch/cris/include/asm/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
92 changes: 0 additions & 92 deletions arch/cris/include/uapi/asm/socket.h

This file was deleted.

0 comments on commit 4526692

Please sign in to comment.