From e26e954f799c39e2a1add6b2a2139fe8c8e69141 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 13 Mar 2009 04:31:34 +0000 Subject: [PATCH] --- yaml --- r: 133327 b: refs/heads/master c: 02ebd32f52c10f90f810e85d0281e9e81dd6e741 h: refs/heads/master i: 133325: cd10496fbb60f8a321f93df15c0e8c531cc5a84c 133323: dd2bfab8dd24c880269cd46aa97972e8d64c82d5 133319: 497e25651f695b0a5a4ff36e843ccc08a7056752 133311: 128e0f68607b99df6d4e4e79cf29368727d078a2 v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/dma/dma-sh.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b3e1d0d965dc..813dea02875a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a83c0b739f3ad1887704cfa9f1ee5ee208cf1532 +refs/heads/master: 02ebd32f52c10f90f810e85d0281e9e81dd6e741 diff --git a/trunk/arch/sh/drivers/dma/dma-sh.c b/trunk/arch/sh/drivers/dma/dma-sh.c index ab7b18dcbaba..31c2930f2f54 100644 --- a/trunk/arch/sh/drivers/dma/dma-sh.c +++ b/trunk/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) {