Merge tag 'gpio-v3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[pandora-kernel.git] / Documentation / arm / memory.txt

diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index 4bfb9ff..38dc06d 100644 (file)
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -41,16 +41,9 @@ fffe8000     fffeffff        DTCM mapping area for platforms with
 fffe0000       fffe7fff        ITCM mapping area for platforms with
                                ITCM mounted inside the CPU.
 
-fff00000       fffdffff        Fixmap mapping region.  Addresses provided
+ffc00000       ffdfffff        Fixmap mapping region.  Addresses provided
                                by fix_to_virt() will be located here.
 
-ffc00000       ffefffff        DMA memory mapping region.  Memory returned
-                               by the dma_alloc_xxx functions will be
-                               dynamically mapped here.
-
-ff000000       ffbfffff        Reserved for future expansion of DMA
-                               mapping region.
-
 fee00000       feffffff        Mapping of PCI I/O space. This is a static
                                mapping within the vmalloc space.