From patchwork Wed Jul 6 02:30:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 947452 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p662Xpm6005276 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Jul 2011 02:34:13 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QeHve-0003L2-8K; Wed, 06 Jul 2011 02:33:30 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QeHvc-0005my-Gp; Wed, 06 Jul 2011 02:33:28 +0000 Received: from relais.videotron.ca ([24.201.245.36]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QeHtE-00052q-Fb for linux-arm-kernel@lists.infradead.org; Wed, 06 Jul 2011 02:31:01 +0000 Received: from yoda.home ([66.130.28.92]) by vl-mh-mrz25.ip.videotron.ca (Sun Java(tm) System Messaging Server 6.3-8.01 (built Dec 16 2008; 32bit)) with ESMTP id <0LNW00EQK47EAA50@vl-mh-mrz25.ip.videotron.ca> for linux-arm-kernel@lists.infradead.org; Tue, 05 Jul 2011 22:28:26 -0400 (EDT) Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 2D3C321587 for ; Tue, 05 Jul 2011 22:30:44 -0400 (EDT) From: Nicolas Pitre To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/10] ARM: ARM_DMA_ZONE_SIZE is no more Date: Tue, 05 Jul 2011 22:30:42 -0400 Message-id: <1309919442-20451-10-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 1.7.4 In-reply-to: <1309919442-20451-1-git-send-email-nicolas.pitre@linaro.org> References: <1309919442-20451-1-git-send-email-nicolas.pitre@linaro.org> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110705_223100_641395_8A02EACA X-CRM114-Status: GOOD ( 10.58 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [24.201.245.36 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Jul 2011 02:34:13 +0000 (UTC) One less dependency on mach/memory.h. Signed-off-by: Nicolas Pitre --- arch/arm/include/asm/dma.h | 2 -- arch/arm/mm/init.c | 4 ---- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 1d34c11..04c162f 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -1,8 +1,6 @@ #ifndef __ASM_ARM_DMA_H #define __ASM_ARM_DMA_H -#include - /* * This is the maximum virtual address which can be DMA'd from. */ diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index a14caff..d7d9011 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -35,11 +35,7 @@ #include "mm.h" #ifdef CONFIG_ZONE_DMA -#ifdef ARM_DMA_ZONE_SIZE -unsigned long arm_dma_zone_size = ARM_DMA_ZONE_SIZE; -#else unsigned long arm_dma_zone_size __read_mostly; -#endif EXPORT_SYMBOL(arm_dma_zone_size); #endif