summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-10-30 16:24:30 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2012-11-14 08:50:55 +0100
commitb793eab1e318f6ef71e43239e767d04984c57da2 (patch)
tree22b8bcd67de91ef13d9377ae698dc8a571eb46a9
parent395d32496ef1d4f693485c6848d670721db9042d (diff)
downloadblackbird-op-linux-b793eab1e318f6ef71e43239e767d04984c57da2.tar.gz
blackbird-op-linux-b793eab1e318f6ef71e43239e767d04984c57da2.zip
m68k: switch to using the asm-generic auxvec.h
We don't need a local auxvec.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>
-rw-r--r--arch/m68k/include/uapi/asm/Kbuild3
-rw-r--r--arch/m68k/include/uapi/asm/auxvec.h4
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 972bce120e1e..8883a45f77c6 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -1,8 +1,9 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
+generic-y += auxvec.h
+
header-y += a.out.h
-header-y += auxvec.h
header-y += byteorder.h
header-y += cachectl.h
header-y += fcntl.h
diff --git a/arch/m68k/include/uapi/asm/auxvec.h b/arch/m68k/include/uapi/asm/auxvec.h
deleted file mode 100644
index 844d6d52204b..000000000000
--- a/arch/m68k/include/uapi/asm/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASMm68k_AUXVEC_H
-#define __ASMm68k_AUXVEC_H
-
-#endif
OpenPOWER on IntegriCloud