summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/include/asm/shm.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-15 16:16:15 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-15 16:16:15 +0200
commit1a10390708d675ebf1a2f5e169a5165626afbd88 (patch)
treed9ee7d10abd65e580fb74152a501089f51174225 /arch/m68knommu/include/asm/shm.h
parent239bd83104ec6bcba90221d8b0973d2565142ef8 (diff)
parentb635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff)
downloadtalos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.tar.gz
talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.zip
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'arch/m68knommu/include/asm/shm.h')
-rw-r--r--arch/m68knommu/include/asm/shm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/shm.h b/arch/m68knommu/include/asm/shm.h
new file mode 100644
index 000000000000..cc8e522d9050
--- /dev/null
+++ b/arch/m68knommu/include/asm/shm.h
@@ -0,0 +1 @@
+#include <asm-m68k/shm.h>
OpenPOWER on IntegriCloud