]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
sparc: Merge asm-sparc{,64}/socket.h
authorSam Ravnborg <sam@ravnborg.org>
Thu, 5 Jun 2008 21:49:02 +0000 (23:49 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:41:27 +0000 (21:41 -0700)
commitc8b8be5427a48c1a96dc0cf98ba772aedcda7e77
tree18f079e826e051e52beaa27bf4423b1042ec2a77
parent62e612f0abb33c99c55ea3d04626f6799a1cdca9
sparc: Merge asm-sparc{,64}/socket.h

:$ diff -u include/asm-sparc/socket.h include/asm-sparc64/socket.h
:-- include/asm-sparc/socket.h 2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/socket.h 2008-06-13 06:46:39.000000000 +0200
:@@ -48,11 +48,10 @@
: #define SO_TIMESTAMPNS 0x0021
: #define SCM_TIMESTAMPNS SO_TIMESTAMPNS
:
:-#define SO_MARK 0x0022
:-
: /* Security levels - as per NRL IPv6 - don't actually do anything */
: #define SO_SECURITY_AUTHENTICATION 0x5001
: #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002
: #define SO_SECURITY_ENCRYPTION_NETWORK 0x5004
:
:+#define SO_MARK 0x0022
: #endif /* _ASM_SOCKET_H */

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
include/asm-sparc64/socket.h