diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-11-03 05:12:13 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-11-03 05:12:13 -0500 |
| commit | 06e944b8e5fc4bec83f102f98c1ee4f972f5f072 (patch) | |
| tree | d53b1c3ca270f49f1cae63bbe117cc8587e51510 /Documentation/arm | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
| parent | 80d6b0c2eed2a504f6740cd1f5ea76dc50abfc4d (diff) | |
Merge tag 'ronx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into devel-stable
generic fixmaps
ARM support for CONFIG_DEBUG_RODATA
Diffstat (limited to 'Documentation/arm')
| -rw-r--r-- | Documentation/arm/memory.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt index 38dc06d0a791..4178ebda6e66 100644 --- a/Documentation/arm/memory.txt +++ b/Documentation/arm/memory.txt | |||
| @@ -41,7 +41,7 @@ fffe8000 fffeffff DTCM mapping area for platforms with | |||
| 41 | fffe0000 fffe7fff ITCM mapping area for platforms with | 41 | fffe0000 fffe7fff ITCM mapping area for platforms with |
| 42 | ITCM mounted inside the CPU. | 42 | ITCM mounted inside the CPU. |
| 43 | 43 | ||
| 44 | ffc00000 ffdfffff Fixmap mapping region. Addresses provided | 44 | ffc00000 ffefffff Fixmap mapping region. Addresses provided |
| 45 | by fix_to_virt() will be located here. | 45 | by fix_to_virt() will be located here. |
| 46 | 46 | ||
| 47 | fee00000 feffffff Mapping of PCI I/O space. This is a static | 47 | fee00000 feffffff Mapping of PCI I/O space. This is a static |