• Sam Ravnborg's avatar
    sparc: Merge asm-sparc{,64}/sockios.h · e880e870
    Sam Ravnborg authored
    :$ 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: default avatarSam Ravnborg <sam@ravnborg.org>
    e880e870
sockios.h 31 Bytes