aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-iop3xx/memory.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-arm/arch-iop3xx/memory.h')
-rw-r--r--include/asm-arm/arch-iop3xx/memory.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-iop3xx/memory.h b/include/asm-arm/arch-iop3xx/memory.h
index e43ebd984745..25666184e8fc 100644
--- a/include/asm-arm/arch-iop3xx/memory.h
+++ b/include/asm-arm/arch-iop3xx/memory.h
@@ -10,7 +10,7 @@
/*
* Physical DRAM offset.
*/
-#ifndef CONFIG_ARCH_IOP331
+#ifndef CONFIG_ARCH_IOP33X
#define PHYS_OFFSET UL(0xa0000000)
#else
#define PHYS_OFFSET UL(0x00000000)
@@ -23,12 +23,12 @@
* bus_to_virt: Used to convert an address for DMA operations
* to an address that the kernel can use.
*/
-#if defined(CONFIG_ARCH_IOP321)
+#if defined(CONFIG_ARCH_IOP32X)
#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(*IOP321_IATVR2)) | ((*IOP321_IABAR2) & 0xfffffff0))
#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(*IOP321_IALR2)) | ( *IOP321_IATVR2)))
-#elif defined(CONFIG_ARCH_IOP331)
+#elif defined(CONFIG_ARCH_IOP33X)
#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(*IOP331_IATVR2)) | ((*IOP331_IABAR2) & 0xfffffff0))
#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(*IOP331_IALR2)) | ( *IOP331_IATVR2)))