diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 23:50:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-17 21:41:35 -0700 |
| commit | e880e8701cd5a76bc5b9e67e48ab3b21963fbe0a (patch) | |
| tree | 9371546c4909b0c8100acc9cfede15e6a7bd8d2a /include | |
| parent | c8b8be5427a48c1a96dc0cf98ba772aedcda7e77 (diff) | |
| download | op-kernel-dev-e880e8701cd5a76bc5b9e67e48ab3b21963fbe0a.zip op-kernel-dev-e880e8701cd5a76bc5b9e67e48ab3b21963fbe0a.tar.gz | |
sparc: Merge asm-sparc{,64}/sockios.h
:$ diff -u include/asm-sparc/sockios.h include/asm-sparc64/sockios.h
:-- include/asm-sparc/sockios.h 2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/sockios.h 2008-06-13 06:42:07.000000000 +0200
:@@ -1,5 +1,5 @@
:-#ifndef _ASM_SPARC_SOCKIOS_H
:-#define _ASM_SPARC_SOCKIOS_H
:+#ifndef _ASM_SPARC64_SOCKIOS_H
:+#define _ASM_SPARC64_SOCKIOS_H
:
: /* Socket-level I/O control calls. */
: #define FIOSETOWN 0x8901
:@@ -10,5 +10,5 @@
: #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
: #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
:
:-#endif /* !(_ASM_SPARC_SOCKIOS_H) */
:+#endif /* !(_ASM_SPARC64_SOCKIOS_H) */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/sockios.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/asm-sparc64/sockios.h b/include/asm-sparc64/sockios.h index c7d9900..2cb4b64 100644 --- a/include/asm-sparc64/sockios.h +++ b/include/asm-sparc64/sockios.h @@ -1,14 +1 @@ -#ifndef _ASM_SPARC64_SOCKIOS_H -#define _ASM_SPARC64_SOCKIOS_H - -/* Socket-level I/O control calls. */ -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ -#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ - -#endif /* !(_ASM_SPARC64_SOCKIOS_H) */ - +#include <asm-sparc/sockios.h> |
