summaryrefslogtreecommitdiffstats
path: root/arch/avr32/include
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2015-02-06 23:06:42 +0100
committerAndreas Bießmann <andreas.devel@googlemail.com>2015-02-17 22:52:40 +0100
commite9ed41cc5c684b4b08988934544449eb782c14db (patch)
tree3739cdbd76c4bdd276f08166f63179e54085c03b /arch/avr32/include
parent26db7903f5102b8cf5570237ccbfc7f2c0dfd7aa (diff)
downloadblackbird-obmc-uboot-e9ed41cc5c684b4b08988934544449eb782c14db.tar.gz
blackbird-obmc-uboot-e9ed41cc5c684b4b08988934544449eb782c14db.zip
avr32: rename mmu.h definitions
Prefix mmu.h PAGE_xxx definitions with MMU_ in order to prevent a naming conflict with other definitions. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Diffstat (limited to 'arch/avr32/include')
-rw-r--r--arch/avr32/include/asm/arch-at32ap700x/mmu.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/include/asm/arch-at32ap700x/mmu.h b/arch/avr32/include/asm/arch-at32ap700x/mmu.h
index fcd9a05609..4736312f5d 100644
--- a/arch/avr32/include/asm/arch-at32ap700x/mmu.h
+++ b/arch/avr32/include/asm/arch-at32ap700x/mmu.h
@@ -13,9 +13,9 @@
#include <asm/sysreg.h>
-#define PAGE_SHIFT 20
-#define PAGE_SIZE (1UL << PAGE_SHIFT)
-#define PAGE_ADDR_MASK (~(PAGE_SIZE - 1))
+#define MMU_PAGE_SHIFT 20
+#define MMU_PAGE_SIZE (1UL << MMU_PAGE_SHIFT)
+#define MMU_PAGE_ADDR_MASK (~(MMU_PAGE_SIZE - 1))
#define MMU_VMR_CACHE_NONE \
(SYSREG_BF(AP, 3) | SYSREG_BF(SZ, 3) | SYSREG_BIT(TLBELO_D))
OpenPOWER on IntegriCloud