summaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu/linkage.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-07 18:07:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-07 18:07:33 -0700
commit3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (patch)
tree03c61f81542f6c34e32eb5e0dfc3d34668f88fdd /include/asm-m68knommu/linkage.h
parent4c514a5ad1314b872e3185dabaf105c81d39d7e8 (diff)
parent58750139001bae11a1f9b074f3a9c774fecf5ba8 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
Diffstat (limited to 'include/asm-m68knommu/linkage.h')
-rw-r--r--include/asm-m68knommu/linkage.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68knommu/linkage.h b/include/asm-m68knommu/linkage.h
deleted file mode 100644
index c288a19ff48..00000000000
--- a/include/asm-m68knommu/linkage.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-m68k/linkage.h>