diff options
| author | Dmitry Torokhov | 2007-05-08 07:31:11 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2007-05-08 07:31:11 +0200 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /include/asm-arm/arch-iop32x/memory.h | |
| parent | Input: aaed2000_kbd - convert to use polldev library (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | kernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.tar.gz kernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.tar.xz kernel-qcow2-linux-334d0dd8b660557608142f0f77abc6812b48f08b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-iop32x/memory.h')
| -rw-r--r-- | include/asm-arm/arch-iop32x/memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-iop32x/memory.h b/include/asm-arm/arch-iop32x/memory.h index 764cd3f0d416..c51072af214e 100644 --- a/include/asm-arm/arch-iop32x/memory.h +++ b/include/asm-arm/arch-iop32x/memory.h @@ -19,8 +19,8 @@ * bus_to_virt: Used to convert an address for DMA operations * to an address that the kernel can use. */ -#define __virt_to_bus(x) (((__virt_to_phys(x)) & ~(*IOP3XX_IATVR2)) | ((*IOP3XX_IABAR2) & 0xfffffff0)) -#define __bus_to_virt(x) (__phys_to_virt(((x) & ~(*IOP3XX_IALR2)) | ( *IOP3XX_IATVR2))) +#define __virt_to_bus(x) (__virt_to_phys(x)) +#define __bus_to_virt(x) (__phys_to_virt(x)) #endif |