diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-10-30 16:24:35 +1000 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-11-14 08:50:56 +0100 |
| commit | b6f0b0b9bb26fe0d6376c8714303e56293735233 (patch) | |
| tree | bead15cbaa06ad4340e563c4c1c0a6cec90a06d8 /arch/m68k/include/uapi | |
| parent | 8918344ec0d39942e7b91d50d52445be92ea3229 (diff) | |
| download | linux-b6f0b0b9bb26fe0d6376c8714303e56293735233.tar.bz2 | |
m68k: switch to using the asm-generic sockios.h
We don't need a local sockios.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/uapi')
| -rw-r--r-- | arch/m68k/include/uapi/asm/Kbuild | 2 | ||||
| -rw-r--r-- | arch/m68k/include/uapi/asm/sockios.h | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 8b90cbd6344d..5218f3de23f4 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -6,6 +6,7 @@ generic-y += msgbuf.h generic-y += sembuf.h generic-y += shmbuf.h generic-y += socket.h +generic-y += sockios.h header-y += a.out.h header-y += byteorder.h @@ -19,7 +20,6 @@ header-y += ptrace.h header-y += setup.h header-y += sigcontext.h header-y += signal.h -header-y += sockios.h header-y += stat.h header-y += swab.h header-y += termbits.h diff --git a/arch/m68k/include/uapi/asm/sockios.h b/arch/m68k/include/uapi/asm/sockios.h deleted file mode 100644 index c04a23943cb7..000000000000 --- a/arch/m68k/include/uapi/asm/sockios.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __ARCH_M68K_SOCKIOS__ -#define __ARCH_M68K_SOCKIOS__ - -/* 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 /* __ARCH_M68K_SOCKIOS__ */ |