From: Greg Ungerer Date: Mon, 15 Oct 2012 05:43:40 +0000 (+1000) Subject: m68k: switch to using the asm-generic sockios.h X-Git-Tag: next-20121025~89^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5840a162c67d845e505b818a9d6b19857fb2578f;p=karo-tx-linux.git 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 --- diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index 11ce0be28233..c9b3afc517cc 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -30,6 +30,7 @@ generic-y += sembuf.h generic-y += shmbuf.h generic-y += shmparam.h generic-y += siginfo.h +generic-y += sockios.h generic-y += spinlock.h generic-y += statfs.h generic-y += termbits.h diff --git a/arch/m68k/include/asm/sockios.h b/arch/m68k/include/asm/sockios.h deleted file mode 100644 index c04a23943cb7..000000000000 --- a/arch/m68k/include/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__ */