---

yaml --- r: 232395 b: refs/heads/master c: 05b112f h: refs/heads/master i: 232393: 1508306 232391: dabd4a9 v: v3
git-mirror · Jan 25, 2011 · 5c39bc1 · 5c39bc1
1 parent be5244d
commit 5c39bc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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));
 }