summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/include/asm/a.out.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-19 19:04:47 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-19 19:04:47 +0200
commit3e10e879a8c334a5927d800a3663a24d562cfa31 (patch)
tree5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /arch/m68knommu/include/asm/a.out.h
parenttracing/fastboot: improve help text (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff)
downloadlinux-3e10e879a8c334a5927d800a3663a24d562cfa31.tar.xz
linux-3e10e879a8c334a5927d800a3663a24d562cfa31.zip
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts: init/main.c kernel/module.c scripts/bootgraph.pl
Diffstat (limited to 'arch/m68knommu/include/asm/a.out.h')
-rw-r--r--arch/m68knommu/include/asm/a.out.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/include/asm/a.out.h b/arch/m68knommu/include/asm/a.out.h
deleted file mode 100644
index ce18ef99de04..000000000000
--- a/arch/m68knommu/include/asm/a.out.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/a.out.h>