From 5c39bc1d33a7232eec7a590cddbf5bd9a13013ce Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Tue, 25 Jan 2011 11:18:25 +0100
Subject: [PATCH] --- yaml --- r: 232395 b: refs/heads/master c:
 05b112ff98070dc1f3293e8cd8e4c6f468d1084a h: refs/heads/master i:   232393:
 15083064df985d1a043aadb6de8476afe346f1e6   232391:
 dabd4a95d5c38c8b355c15bde3d43f6444505b23 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/include/asm/memory.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 12e30c97501b..ed1ff21c4ea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03399c1cb4e2503e92d10c1ce38ac2e69b7d2380
+refs/heads/master: 05b112ff98070dc1f3293e8cd8e4c6f468d1084a
diff --git a/trunk/arch/arm/include/asm/memory.h b/trunk/arch/arm/include/asm/memory.h
index 23c2e8e5c0fa..d0ee74b7cf86 100644
--- a/trunk/arch/arm/include/asm/memory.h
+++ b/trunk/arch/arm/include/asm/memory.h
@@ -188,7 +188,7 @@
  * translation for translating DMA addresses.  Use the driver
  * DMA support - see dma-mapping.h.
  */
-static inline unsigned long virt_to_phys(void *x)
+static inline unsigned long virt_to_phys(const volatile void *x)
 {
 	return __virt_to_phys((unsigned long)(x));
 }