diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-28 16:39:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 16:39:02 +0100 |
| commit | 7ef4de17cc55a3c3b8d093743b1e3b845d8eba47 (patch) | |
| tree | adf87c996affbb6c42850d55cb34c0e5a2f6d340 /arch/arm/mach-integrator | |
| parent | Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel (diff) | |
| parent | [ARM] remove a common set of __virt_to_bus definitions (diff) | |
| download | linux-7ef4de17cc55a3c3b8d093743b1e3b845d8eba47.tar.xz linux-7ef4de17cc55a3c3b8d093743b1e3b845d8eba47.zip | |
Merge branch 'highmem' into devel
Conflicts:
arch/arm/mach-clps7500/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/memory.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-integrator/include/mach/memory.h b/arch/arm/mach-integrator/include/mach/memory.h index be7e63c21d25..30d41d0e7d04 100644 --- a/arch/arm/mach-integrator/include/mach/memory.h +++ b/arch/arm/mach-integrator/include/mach/memory.h @@ -24,15 +24,8 @@ * Physical DRAM offset. */ #define PHYS_OFFSET UL(0x00000000) -#define BUS_OFFSET UL(0x80000000) -/* - * Virtual view <-> DMA view memory address translations - * virt_to_bus: Used to translate the virtual address to an - * address suitable to be passed to set_dma_addr - * bus_to_virt: Used to convert an address for DMA operations - * to an address that the kernel can use. - */ +#define BUS_OFFSET UL(0x80000000) #define __virt_to_bus(x) (x - PAGE_OFFSET + BUS_OFFSET) #define __bus_to_virt(x) (x - BUS_OFFSET + PAGE_OFFSET) |