summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-10-30 16:24:29 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2012-11-14 08:50:55 +0100
commit395d32496ef1d4f693485c6848d670721db9042d (patch)
treedc5f7abe21275050d83c0b06959b711e90913f46 /arch/m68k
parent8affd3e8122537a295bb69571a68f816a5e6867c (diff)
downloadop-kernel-dev-395d32496ef1d4f693485c6848d670721db9042d.zip
op-kernel-dev-395d32496ef1d4f693485c6848d670721db9042d.tar.gz
m68k: switch to using the asm-generic shmparam.h
We don't need a local shmparam.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>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/Kbuild1
-rw-r--r--arch/m68k/include/asm/shmparam.h6
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index a494c3e..6c88287 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -22,6 +22,7 @@ generic-y += percpu.h
generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
+generic-y += shmparam.h
generic-y += siginfo.h
generic-y += spinlock.h
generic-y += statfs.h
diff --git a/arch/m68k/include/asm/shmparam.h b/arch/m68k/include/asm/shmparam.h
deleted file mode 100644
index 558892a..0000000
--- a/arch/m68k/include/asm/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68K_SHMPARAM_H
-#define _M68K_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
-
-#endif /* _M68K_SHMPARAM_H */
OpenPOWER on IntegriCloud