From e8108a3c0a494f0b5e1e9db69483fd4943989483 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 30 Oct 2012 16:24:29 +1000 Subject: [PATCH] --- yaml --- r: 343363 b: refs/heads/master c: 395d32496ef1d4f693485c6848d670721db9042d h: refs/heads/master i: 343361: 8ecfba2269ebf9c17666baa347ddb03319370716 343359: 80825ae16762dbbfb0274d62098d84026aa5e651 v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/Kbuild | 1 + trunk/arch/m68k/include/asm/shmparam.h | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 trunk/arch/m68k/include/asm/shmparam.h diff --git a/[refs] b/[refs] index 20958febbd53..4eafa741066e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8affd3e8122537a295bb69571a68f816a5e6867c +refs/heads/master: 395d32496ef1d4f693485c6848d670721db9042d diff --git a/trunk/arch/m68k/include/asm/Kbuild b/trunk/arch/m68k/include/asm/Kbuild index a494c3eab9f2..6c882877eda3 100644 --- a/trunk/arch/m68k/include/asm/Kbuild +++ b/trunk/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/trunk/arch/m68k/include/asm/shmparam.h b/trunk/arch/m68k/include/asm/shmparam.h deleted file mode 100644 index 558892a2efb3..000000000000 --- a/trunk/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 */