From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH v3 09/11] m68k: switch to using the asm-generic sockios.h
Date: Tue, 30 Oct 2012 16:24:35 +1000 [thread overview]
Message-ID: <1351578277-31882-10-git-send-email-gerg@snapgear.com> (raw)
In-Reply-To: <1351578277-31882-1-git-send-email-gerg@snapgear.com>
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local sockios.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/uapi/asm/Kbuild | 2 +-
arch/m68k/include/uapi/asm/sockios.h | 13 -------------
2 files changed, 1 insertions(+), 14 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/sockios.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 8b90cbd..5218f3d 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 c04a239..0000000
--- 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__ */
--
1.7.0.4
next prev parent reply other threads:[~2012-10-30 6:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 6:24 [PATCH v3 00/11] m68k: use asm-generic headers when possible gerg
2012-10-30 6:24 ` [PATCH v3 01/11] m68k: switch to using the asm-generic hw_irq.h gerg
2012-10-30 6:24 ` [PATCH v3 02/11] m68k: switch to using the asm-generic spinlock.h gerg
2012-10-30 6:24 ` [PATCH v3 03/11] m68k: switch to using the asm-generic shmparam.h gerg
2012-10-30 6:24 ` [PATCH v3 04/11] m68k: switch to using the asm-generic auxvec.h gerg
2012-10-30 6:24 ` [PATCH v3 05/11] m68k: switch to using the asm-generic msgbuf.h gerg
2012-10-30 6:24 ` [PATCH v3 06/11] m68k: switch to using the asm-generic sembuf.h gerg
2012-10-30 6:24 ` [PATCH v3 07/11] m68k: switch to using the asm-generic shmbuf.h gerg
2012-10-30 6:24 ` [PATCH v3 08/11] m68k: switch to using the asm-generic socket.h gerg
2012-10-30 6:24 ` gerg [this message]
2012-10-30 6:24 ` [PATCH v3 10/11] m68k: switch to using the asm-generic termbits.h gerg
2012-10-30 6:24 ` [PATCH v3 11/11] m68k: switch to using the asm-generic termios.h gerg
2012-11-11 10:30 ` [PATCH v3 00/11] m68k: use asm-generic headers when possible Geert Uytterhoeven
2012-11-12 4:19 ` Greg Ungerer
2012-11-14 7:56 ` Geert Uytterhoeven
2012-11-14 10:29 ` Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351578277-31882-10-git-send-email-gerg@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox