From f8f71e5d622de7a0aabdee6b4fa938947a844f9c Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Thu, 16 Jun 2011 05:08:28 +0000
Subject: [PATCH] --- yaml --- r: 261914 b: refs/heads/master c:
 090b91805a97f58a7deff0f2b40aad1cc2f1b7e0 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/dma/shdma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1981828a13c1..6e861f17e713 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d2c0980262e70f5643df34493ffd7e608282c16
+refs/heads/master: 090b91805a97f58a7deff0f2b40aad1cc2f1b7e0
diff --git a/trunk/drivers/dma/shdma.c b/trunk/drivers/dma/shdma.c
index 3d22eb82289d..41a21b322960 100644
--- a/trunk/drivers/dma/shdma.c
+++ b/trunk/drivers/dma/shdma.c
@@ -211,7 +211,7 @@ static int dmae_set_dmars(struct sh_dmae_chan *sh_chan, u16 val)
 	struct sh_dmae_pdata *pdata = shdev->pdata;
 	const struct sh_dmae_channel *chan_pdata = &pdata->channel[sh_chan->id];
 	u16 __iomem *addr = shdev->dmars;
-	int shift = chan_pdata->dmars_bit;
+	unsigned int shift = chan_pdata->dmars_bit;
 
 	if (dmae_is_busy(sh_chan))
 		return -EBUSY;