diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-16 15:06:20 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-16 15:06:20 -0500 |
| commit | 1cc76b5ee02e4e884339ee3baf43cafd26dd4f1b (patch) | |
| tree | 480f1e88d9966a913a67f63f74d5486363903fff /arch/arm/mm | |
| parent | 8bea8672edfca7ec5f661cafb218f1205863b343 (diff) | |
| parent | 1cb9f9b086f818eb9543ed759382de7b95c67f87 (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 5485c821101c..395cc90c6613 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -254,10 +254,9 @@ __pj4_v6_proc_info: | |||
| 254 | .long 0x560f5810 | 254 | .long 0x560f5810 |
| 255 | .long 0xff0ffff0 | 255 | .long 0xff0ffff0 |
| 256 | .long PMD_TYPE_SECT | \ | 256 | .long PMD_TYPE_SECT | \ |
| 257 | PMD_SECT_BUFFERABLE | \ | ||
| 258 | PMD_SECT_CACHEABLE | \ | ||
| 259 | PMD_SECT_AP_WRITE | \ | 257 | PMD_SECT_AP_WRITE | \ |
| 260 | PMD_SECT_AP_READ | 258 | PMD_SECT_AP_READ | \ |
| 259 | PMD_FLAGS | ||
| 261 | .long PMD_TYPE_SECT | \ | 260 | .long PMD_TYPE_SECT | \ |
| 262 | PMD_SECT_XN | \ | 261 | PMD_SECT_XN | \ |
| 263 | PMD_SECT_AP_WRITE | \ | 262 | PMD_SECT_AP_WRITE | \ |