From d42efaec8d847cc4faf59032acbbc152a94c29e1 Mon Sep 17 00:00:00 2001
From: Sekhar Nori <nsekhar@ti.com>
Date: Wed, 10 Apr 2013 14:57:14 +0530
Subject: [PATCH] --- yaml --- r: 370649 b: refs/heads/master c:
 182e7961caa1ce4fce1787ec75c1e2e6021307bd h: refs/heads/master i:   370647:
 0941438e6de12b27778333601aebf414abcf7ee1 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-davinci/sram.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5f9658860d5c..8062ab674bd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 267f3c07318b1b1bf04f6039bda7c54613d9e120
+refs/heads/master: 182e7961caa1ce4fce1787ec75c1e2e6021307bd
diff --git a/trunk/arch/arm/mach-davinci/sram.c b/trunk/arch/arm/mach-davinci/sram.c
index c5f7ee5cc80a..f18928b073f5 100644
--- a/trunk/arch/arm/mach-davinci/sram.c
+++ b/trunk/arch/arm/mach-davinci/sram.c
@@ -62,7 +62,7 @@ static int __init sram_init(void)
 	phys_addr_t phys = davinci_soc_info.sram_dma;
 	unsigned len = davinci_soc_info.sram_len;
 	int status = 0;
-	void *addr;
+	void __iomem *addr;
 
 	if (len) {
 		len = min_t(unsigned, len, SRAM_SIZE);
@@ -75,7 +75,7 @@ static int __init sram_init(void)
 		addr = ioremap(phys, len);
 		if (!addr)
 			return -ENOMEM;
-		status = gen_pool_add_virt(sram_pool, (unsigned)addr,
+		status = gen_pool_add_virt(sram_pool, (unsigned long) addr,
 					   phys, len, -1);
 		if (status < 0)
 			iounmap(addr);