5 files changed, 9 insertions, 9 deletions

diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl
index f508a8a27fea..5e7d84b48505 100644
--- a/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
@@ -174,7 +174,7 @@
                 </para>
                 <programlisting>
 static struct mtd_info *board_mtd;
-static unsigned long baseaddr;
+static void __iomem *baseaddr;
                 </programlisting>
                 <para>
                         Static example
@@ -182,7 +182,7 @@ static unsigned long baseaddr;
                 <programlisting>
 static struct mtd_info board_mtd;
 static struct nand_chip board_chip;
-static unsigned long baseaddr;
+static void __iomem *baseaddr;
                 </programlisting>
         </sect1>
         <sect1 id="Partition_defines">
@@ -283,8 +283,8 @@ int __init board_init (void)
         }
 
         /* map physical address */
-        baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
-        if(!baseaddr){
+        baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
+        if (!baseaddr) {
                 printk("Ioremap to access NAND chip failed\n");
                 err = -EIO;
                 goto out_mtd;
@@ -316,7 +316,7 @@ int __init board_init (void)
         goto out;
 
 out_ior:
-        iounmap((void *)baseaddr);
+        iounmap(baseaddr);
 out_mtd:
         kfree (board_mtd);
 out:
@@ -341,7 +341,7 @@ static void __exit board_cleanup (void)
         nand_release (board_mtd);
 
         /* unmap physical address */
-        iounmap((void *)baseaddr);
+        iounmap(baseaddr);
         
         /* Free the MTD device structure */
         kfree (board_mtd);
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);
diff --git a/Documentation/DMA-mapping.txt b/Documentation/PCI/PCI-DMA-mapping.txt
index ecad88d9fe59..ecad88d9fe59 100644
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/PCI/PCI-DMA-mapping.txt
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 8d2158a1c6aa..6fab97ea7e6b 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -186,7 +186,7 @@ a virtual address mapping (unlike the earlier scheme of virtual address
 do not have a corresponding kernel virtual address space mapping) and
 low-memory pages.
 
-Note: Please refer to Documentation/DMA-mapping.txt for a discussion
+Note: Please refer to Documentation/PCI/PCI-DMA-mapping.txt for a discussion
 on PCI high mem DMA aspects and mapping of scatter gather lists, and support
 for 64 bit PCI.
 
diff --git a/Documentation/filesystems/nilfs2.txt b/Documentation/filesystems/nilfs2.txt
index 4949fcaa6b6a..839efd8a8a8c 100644
--- a/Documentation/filesystems/nilfs2.txt
+++ b/Documentation/filesystems/nilfs2.txt
@@ -28,7 +28,7 @@ described in the man pages included in the package.
 Project web page:    http://www.nilfs.org/en/
 Download page:       http://www.nilfs.org/en/download.html
 Git tree web page:   http://www.nilfs.org/git/
-NILFS mailing lists: http://www.nilfs.org/mailman/listinfo/users
+List info:           http://vger.kernel.org/vger-lists.html#linux-nilfs
 
 Caveats
 =======