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)))

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 @@
10	/*	10	/*
11	* Physical DRAM offset.	11	* Physical DRAM offset.
12	*/	12	*/
13	#ifndef CONFIG_ARCH_IOP331	13	#ifndef CONFIG_ARCH_IOP33X
14	#define PHYS_OFFSET UL(0xa0000000)	14	#define PHYS_OFFSET UL(0xa0000000)
15	#else	15	#else
16	#define PHYS_OFFSET UL(0x00000000)	16	#define PHYS_OFFSET UL(0x00000000)
@@ -23,12 +23,12 @@
23	* bus_to_virt: Used to convert an address for DMA operations	23	* bus_to_virt: Used to convert an address for DMA operations
24	* to an address that the kernel can use.	24	* to an address that the kernel can use.
25	*/	25	*/
26	#if defined(CONFIG_ARCH_IOP321)	26	#if defined(CONFIG_ARCH_IOP32X)
27		27
28	#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(IOP321_IATVR2)) \| ((IOP321_IABAR2) & 0xfffffff0))	28	#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(IOP321_IATVR2)) \| ((IOP321_IABAR2) & 0xfffffff0))
29	#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(IOP321_IALR2)) \| ( IOP321_IATVR2)))	29	#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(IOP321_IALR2)) \| ( IOP321_IATVR2)))
30		30
31	#elif defined(CONFIG_ARCH_IOP331)	31	#elif defined(CONFIG_ARCH_IOP33X)
32		32
33	#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(IOP331_IATVR2)) \| ((IOP331_IABAR2) & 0xfffffff0))	33	#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(IOP331_IATVR2)) \| ((IOP331_IABAR2) & 0xfffffff0))
34	#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(IOP331_IALR2)) \| ( IOP331_IATVR2)))	34	#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(IOP331_IALR2)) \| ( IOP331_IATVR2)))