diff options
Diffstat (limited to 'include/asm-arm/arch-iop32x/memory.h')
-rw-r--r-- | include/asm-arm/arch-iop32x/memory.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-arm/arch-iop32x/memory.h b/include/asm-arm/arch-iop32x/memory.h index 4c64d9e7229b..764cd3f0d416 100644 --- a/include/asm-arm/arch-iop32x/memory.h +++ b/include/asm-arm/arch-iop32x/memory.h | |||
@@ -1,9 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * linux/include/asm-arm/arch-iop32x/memory.h | 2 | * include/asm-arm/arch-iop32x/memory.h |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #ifndef __ASM_ARCH_MEMORY_H | 5 | #ifndef __MEMORY_H |
6 | #define __ASM_ARCH_MEMORY_H | 6 | #define __MEMORY_H |
7 | 7 | ||
8 | #include <asm/hardware.h> | 8 | #include <asm/hardware.h> |
9 | 9 | ||
@@ -19,7 +19,6 @@ | |||
19 | * bus_to_virt: Used to convert an address for DMA operations | 19 | * bus_to_virt: Used to convert an address for DMA operations |
20 | * to an address that the kernel can use. | 20 | * to an address that the kernel can use. |
21 | */ | 21 | */ |
22 | |||
23 | #define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(*IOP3XX_IATVR2)) | ((*IOP3XX_IABAR2) & 0xfffffff0)) | 22 | #define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(*IOP3XX_IATVR2)) | ((*IOP3XX_IABAR2) & 0xfffffff0)) |
24 | #define __bus_to_virt(x) (__phys_to_virt(((x) & ~(*IOP3XX_IALR2)) | ( *IOP3XX_IATVR2))) | 23 | #define __bus_to_virt(x) (__phys_to_virt(((x) & ~(*IOP3XX_IALR2)) | ( *IOP3XX_IATVR2))) |
25 | 24 | ||