diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-28 18:39:02 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 18:39:02 +0300 |
| commit | 7ef4de17cc55a3c3b8d093743b1e3b845d8eba47 (patch) | |
| tree | adf87c996affbb6c42850d55cb34c0e5a2f6d340 /arch/arm/mach-ixp2000/include/mach/memory.h | |
| parent | f412b09f4ed7c57f5b8935ed7d6fc786f402a629 (diff) | |
| parent | b5ee9002583fc14e6d45a04c18f208987a8fbced (diff) | |
| download | linux-7ef4de17cc55a3c3b8d093743b1e3b845d8eba47.tar.xz | |
Merge branch 'highmem' into devel
Conflicts:
arch/arm/mach-clps7500/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-ixp2000/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-ixp2000/include/mach/memory.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-ixp2000/include/mach/memory.h b/arch/arm/mach-ixp2000/include/mach/memory.h index 241529a7c52d..aee7eb8a71b2 100644 --- a/arch/arm/mach-ixp2000/include/mach/memory.h +++ b/arch/arm/mach-ixp2000/include/mach/memory.h @@ -15,13 +15,6 @@ #define PHYS_OFFSET UL(0x00000000) -/* - * 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. - */ #include <mach/ixp2000-regs.h> #define __virt_to_bus(v) \ |