diff --git a/[refs] b/[refs]
index 5fddf66e14b1..8470f254a9f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b6764fa9e25cf628e42bbd192eca1e0b8e59061
+refs/heads/master: 143724fd3d3c154009fe95846dcbf7afadca8ab1
diff --git a/trunk/Documentation/IO-mapping.txt b/trunk/Documentation/IO-mapping.txt
index 78a440695e11..1b5aa10df845 100644
--- a/trunk/Documentation/IO-mapping.txt
+++ b/trunk/Documentation/IO-mapping.txt
@@ -157,7 +157,7 @@ For such memory, you can do things like
 	 * access only the 640k-1MB area, so anything else
 	 * has to be remapped.
 	 */
-	char * baseptr = ioremap(0xFC000000, 1024*1024);
+	void __iomem *baseptr = ioremap(0xFC000000, 1024*1024);
 
 	/* write a 'A' to the offset 10 of the area */
 	writeb('A',baseptr+10);