From: Greg Ungerer Date: Tue, 30 Oct 2012 06:24:29 +0000 (+1000) Subject: m68k: switch to using the asm-generic shmparam.h X-Git-Tag: v3.8-rc1~124^2~12 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=395d32496ef1d4f693485c6848d670721db9042d;p=~emulex%2Finfiniband.git 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 Signed-off-by: Geert Uytterhoeven --- diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index a494c3eab9f..6c882877eda 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 558892a2efb..00000000000 --- 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 */