From patchwork Fri Mar 13 04:31:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 11594 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2D4Vasf017404 for ; Fri, 13 Mar 2009 04:31:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751218AbZCMEbh (ORCPT ); Fri, 13 Mar 2009 00:31:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751944AbZCMEbh (ORCPT ); Fri, 13 Mar 2009 00:31:37 -0400 Received: from mail.renesas.com ([202.234.163.13]:38086 "EHLO mail06.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751218AbZCMEbg (ORCPT ); Fri, 13 Mar 2009 00:31:36 -0400 X-AuditID: ac14038a-0000000600001ca1-14-49b9e1a44e5b Received: from guardian02.idc.renesas.com ([172.20.8.201]) by mail06.idc.renesas.com (sendmail) with ESMTP id n2D4VWAh004456; Fri, 13 Mar 2009 13:31:32 +0900 (JST) Received: (from root@localhost) by guardian02.idc.renesas.com with id n2D4VWjD005054; Fri, 13 Mar 2009 13:31:32 +0900 (JST) Received: from mta02.idc.renesas.com (localhost [127.0.0.1]) by mta02.idc.renesas.com with ESMTP id n2D4VYNs015266; Fri, 13 Mar 2009 13:31:34 +0900 (JST) Received: from [172.30.8.158] by ims05.idc.renesas.com (Sendmail) with ESMTPA id <0KGF00GF5GKK5B@ims05.idc.renesas.com>; Fri, 13 Mar 2009 13:31:32 +0900 (JST) Date: Fri, 13 Mar 2009 13:31:34 +0900 From: Nobuhiro Iwamatsu Subject: [PATCH] sh: Fix problem that get_dma_error_irq is compiled in SH3 To: Linux-sh Cc: Paul Mundt Message-id: <49B9E1A6.2010602@renesas.com> MIME-version: 1.0 Content-type: text/plain; charset=ISO-2022-JP Content-transfer-encoding: 7bit User-Agent: Thunderbird 1.5.0.14 (Windows/20071210) X-Brightmail-Tracker: AAAAAA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org get_dma_error_irq() used in dma-sh is function for exclusive use of SH4. SH3 doesn't have DMA Error interrupt. This fixes it to compile it only in SH4. Signed-off-by: Nobuhiro Iwamatsu --- arch/sh/drivers/dma/dma-sh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c index ab7b18d..31c2930 100644 --- a/arch/sh/drivers/dma/dma-sh.c +++ b/arch/sh/drivers/dma/dma-sh.c @@ -280,6 +280,7 @@ static struct dma_info sh_dmac_info = { .flags = DMAC_CHANNELS_TEI_CAPABLE, }; +#ifdef CONFIG_CPU_SH4 static unsigned int get_dma_error_irq(int n) { #if defined(DMAC_IRQ_MULTI) @@ -293,6 +294,7 @@ static unsigned int get_dma_error_irq(int n) #endif #endif } +#endif static int __init sh_dmac_init(void) {