summary refs log tree commit diff
path: root/Documentation
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2010-01-01 20:35:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-02 10:09:44 -0800
commit143724fd3d3c154009fe95846dcbf7afadca8ab1 (patch)
treeb4d5f274be8fbe92a31d22c39f35d695219c3aab /Documentation
parent4b6764fa9e25cf628e42bbd192eca1e0b8e59061 (diff)
downloadlinux-143724fd3d3c154009fe95846dcbf7afadca8ab1.tar.gz
Documentation: fix ioremap return type
ioremap() returns a void __iomem * not a char *.  Update the documentation
file to reflect this.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/IO-mapping.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/IO-mapping.txt b/Documentation/IO-mapping.txt
index 78a440695e11..1b5aa10df845 100644
--- a/Documentation/IO-mapping.txt
+++ b/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);