From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: [PATCH v2 03/11] m68k: switch to using the asm-generic shmparam.h Date: Mon, 29 Oct 2012 15:49:26 +1000 Message-ID: <1351489774-14263-4-git-send-email-gerg@snapgear.com> References: <1351489774-14263-1-git-send-email-gerg@snapgear.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from dalsmrelay2.nai.com ([205.227.136.216]:49567 "EHLO dalsmrelay2.nai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752092Ab2J2F5T (ORCPT ); Mon, 29 Oct 2012 01:57:19 -0400 In-Reply-To: <1351489774-14263-1-git-send-email-gerg@snapgear.com> Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: linux-m68k@vger.kernel.org, linux-arch@vger.kernel.org Cc: Greg Ungerer From: Greg Ungerer We don't need a local shmparam.h, switch to using the asm-generic version. Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/Kbuild | 1 + arch/m68k/include/asm/shmparam.h | 6 ------ 2 files changed, 1 insertions(+), 6 deletions(-) delete mode 100644 arch/m68k/include/asm/shmparam.h diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index fbf0306..a0c4c9a 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -23,6 +23,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 += statfs.h generic-y += topology.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 */ -- 1.7.0.4