diff --git a/[refs] b/[refs] index e73d27c00f86..0c09e1a3ecf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8b8be5427a48c1a96dc0cf98ba772aedcda7e77 +refs/heads/master: e880e8701cd5a76bc5b9e67e48ab3b21963fbe0a diff --git a/trunk/include/asm-sparc64/sockios.h b/trunk/include/asm-sparc64/sockios.h index c7d9900638d0..2cb4b641482c 100644 --- a/trunk/include/asm-sparc64/sockios.h +++ b/trunk/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