]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sparc: Merge asm-sparc{,64}/sockios.h
authorSam Ravnborg <sam@ravnborg.org>
Thu, 5 Jun 2008 21:50:10 +0000 (23:50 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:41:35 +0000 (21:41 -0700)
:$ 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>
include/asm-sparc64/sockios.h

index c7d9900638d0da5ffd762a46f88a2c130e201a26..2cb4b641482cd9b96c55dc4b3819dfba7b05379d 100644 (file)
@@ -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>