From caa5999129bff978d0c975f118354326c3de3d33 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Fri, 19 Mar 2010 04:46:47 +0000
Subject: [PATCH] --- yaml --- r: 191585 b: refs/heads/master c:
 02ca5083f60521d09f13224596564a405108bc4c h: refs/heads/master i:   191583:
 be4e472f40b1883881e08d5a4ab677e8cacffe17 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sh/include/asm/dmaengine.h | 1 -
 trunk/drivers/dma/shdma.c             | 4 ++--
 trunk/drivers/dma/shdma.h             | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8f907868796b..c8fa3eaf7dda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bab9d426e6dbd9ea09330919a33d35d5faab400
+refs/heads/master: 02ca5083f60521d09f13224596564a405108bc4c
diff --git a/trunk/arch/sh/include/asm/dmaengine.h b/trunk/arch/sh/include/asm/dmaengine.h
index 568e991442b0..abb8d660b6fb 100644
--- a/trunk/arch/sh/include/asm/dmaengine.h
+++ b/trunk/arch/sh/include/asm/dmaengine.h
@@ -34,7 +34,6 @@ enum {
 	SHDMA_SLAVE_SIUA_RX,
 	SHDMA_SLAVE_SIUB_TX,
 	SHDMA_SLAVE_SIUB_RX,
-	SHDMA_SLAVE_NUMBER,	/* Must stay last */
 };
 
 struct sh_dmae_slave_config {
diff --git a/trunk/drivers/dma/shdma.c b/trunk/drivers/dma/shdma.c
index e5588f4868ca..83605389fb56 100644
--- a/trunk/drivers/dma/shdma.c
+++ b/trunk/drivers/dma/shdma.c
@@ -44,7 +44,7 @@ enum sh_dmae_desc_status {
 #define LOG2_DEFAULT_XFER_SIZE	2
 
 /* A bitmask with bits enough for enum sh_dmae_slave_chan_id */
-static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SHDMA_SLAVE_NUMBER)];
+static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SH_DMA_SLAVE_NUMBER)];
 
 static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all);
 
@@ -274,7 +274,7 @@ static struct sh_dmae_slave_config *sh_dmae_find_slave(
 	struct sh_dmae_pdata *pdata = shdev->pdata;
 	int i;
 
-	if (param->slave_id >= SHDMA_SLAVE_NUMBER)
+	if (param->slave_id >= SH_DMA_SLAVE_NUMBER)
 		return NULL;
 
 	for (i = 0; i < pdata->slave_num; i++)
diff --git a/trunk/drivers/dma/shdma.h b/trunk/drivers/dma/shdma.h
index 153609a1e96c..d7ddf6f47154 100644
--- a/trunk/drivers/dma/shdma.h
+++ b/trunk/drivers/dma/shdma.h
@@ -19,6 +19,7 @@
 
 #include <asm/dmaengine.h>
 
+#define SH_DMA_SLAVE_NUMBER 256
 #define SH_DMA_TCR_MAX 0x00FFFFFF	/* 16MB */
 
 struct device;