diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /Documentation/IO-mapping.txt | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'Documentation/IO-mapping.txt')
| -rw-r--r-- | Documentation/IO-mapping.txt | 2 |
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 | |||
| 157 | * access only the 640k-1MB area, so anything else | 157 | * access only the 640k-1MB area, so anything else |
| 158 | * has to be remapped. | 158 | * has to be remapped. |
| 159 | */ | 159 | */ |
| 160 | char * baseptr = ioremap(0xFC000000, 1024*1024); | 160 | void __iomem *baseptr = ioremap(0xFC000000, 1024*1024); |
| 161 | 161 | ||
| 162 | /* write a 'A' to the offset 10 of the area */ | 162 | /* write a 'A' to the offset 10 of the area */ |
| 163 | writeb('A',baseptr+10); | 163 | writeb('A',baseptr+10); |