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>
git-mirror · Nov 14, 2012 · b6f0b0b · b6f0b0b
1 parent 8918344
commit b6f0b0b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git 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