From f2d266a7908dc6d153c3e396a59654728ac60d5b Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 27 Nov 2011 21:35:40 +0000
Subject: [PATCH] --- yaml --- r: 283823 b: refs/heads/master c:
 9b8f5695a155308a4e0355a29747961bec9757c0 h: refs/heads/master i:   283821:
 79f1fd373e40fc87bdaefd606b911fdf27c6be42   283819:
 a0fc91ef65e242a2528775ad3867c2c8f4483028   283815:
 055dc307f5311bc87b4980e72a3f5d68df76ace1   283807:
 21e7b59ed605b5249e0b3e0690e96969b6d6cc4f v: v3

---
 [refs]                         | 2 +-
 trunk/sound/soc/samsung/i2s.c  | 2 +-
 trunk/sound/soc/samsung/idma.c | 2 +-
 trunk/sound/soc/samsung/idma.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c07497bcf56b..2b891b11f0ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cdf5e49ce8ff79038ee5388cc5f97097238bb29
+refs/heads/master: 9b8f5695a155308a4e0355a29747961bec9757c0
diff --git a/trunk/sound/soc/samsung/i2s.c b/trunk/sound/soc/samsung/i2s.c
index fb80f2886c70..5de500ce5dd4 100644
--- a/trunk/sound/soc/samsung/i2s.c
+++ b/trunk/sound/soc/samsung/i2s.c
@@ -881,7 +881,7 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
 		writel(CON_RSTCLR, i2s->addr + I2SCON);
 
 	if (i2s->quirks & QUIRK_SEC_DAI)
-		idma_reg_addr_init((void *)i2s->addr,
+		idma_reg_addr_init(i2s->addr,
 					i2s->sec_dai->idma_playback.dma_addr);
 
 probe_exit:
diff --git a/trunk/sound/soc/samsung/idma.c b/trunk/sound/soc/samsung/idma.c
index 6ca3d8c221a0..baf97ebadd48 100644
--- a/trunk/sound/soc/samsung/idma.c
+++ b/trunk/sound/soc/samsung/idma.c
@@ -403,7 +403,7 @@ static int idma_new(struct snd_soc_pcm_runtime *rtd)
 	return ret;
 }
 
-void idma_reg_addr_init(void *regs, dma_addr_t addr)
+void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr)
 {
 	spin_lock_init(&idma.lock);
 	idma.regs = regs;
diff --git a/trunk/sound/soc/samsung/idma.h b/trunk/sound/soc/samsung/idma.h
index 48273216166e..8644946973e5 100644
--- a/trunk/sound/soc/samsung/idma.h
+++ b/trunk/sound/soc/samsung/idma.h
@@ -14,7 +14,7 @@
 #ifndef __SND_SOC_SAMSUNG_IDMA_H_
 #define __SND_SOC_SAMSUNG_IDMA_H_
 
-extern void idma_reg_addr_init(void *regs, dma_addr_t addr);
+extern void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr);
 
 /* dma_state */
 #define LPAM_DMA_STOP	0