aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/IO-mapping.txt
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-21 23:55:25 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-21 23:55:25 -0800
commit7755726fe90a8b253659756e6de68c1a55aa427f (patch)
treea3523fa77e07854db3b8089e3066a55ea997060c /Documentation/IO-mapping.txt
parent3bf127637e22ddf95e67e10a23c339cee3d52429 (diff)
parent92dcffb916d309aa01778bf8963a6932e4014d07 (diff)
downloadkernel_samsung_smdk4412-7755726fe90a8b253659756e6de68c1a55aa427f.zip
kernel_samsung_smdk4412-7755726fe90a8b253659756e6de68c1a55aa427f.tar.gz
kernel_samsung_smdk4412-7755726fe90a8b253659756e6de68c1a55aa427f.tar.bz2
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'Documentation/IO-mapping.txt')
-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 78a4406..1b5aa10 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);