diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-28 10:39:02 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 10:39:02 -0500 |
| commit | 7ef4de17cc55a3c3b8d093743b1e3b845d8eba47 (patch) | |
| tree | adf87c996affbb6c42850d55cb34c0e5a2f6d340 /arch/arm/mach-pxa/include | |
| parent | f412b09f4ed7c57f5b8935ed7d6fc786f402a629 (diff) | |
| parent | b5ee9002583fc14e6d45a04c18f208987a8fbced (diff) | |
Merge branch 'highmem' into devel
Conflicts:
arch/arm/mach-clps7500/include/mach/memory.h
Diffstat (limited to 'arch/arm/mach-pxa/include')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/memory.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h index 59aef89808d6..eac491c2d741 100644 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ b/arch/arm/mach-pxa/include/mach/memory.h | |||
| @@ -18,16 +18,6 @@ | |||
| 18 | #define PHYS_OFFSET UL(0xa0000000) | 18 | #define PHYS_OFFSET UL(0xa0000000) |
| 19 | 19 | ||
| 20 | /* | 20 | /* |
| 21 | * Virtual view <-> DMA view memory address translations | ||
| 22 | * virt_to_bus: Used to translate the virtual address to an | ||
| 23 | * address suitable to be passed to set_dma_addr | ||
| 24 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 25 | * to an address that the kernel can use. | ||
| 26 | */ | ||
| 27 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 28 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 29 | |||
| 30 | /* | ||
| 31 | * The nodes are matched with the physical SDRAM banks as follows: | 21 | * The nodes are matched with the physical SDRAM banks as follows: |
| 32 | * | 22 | * |
| 33 | * node 0: 0xa0000000-0xa3ffffff --> 0xc0000000-0xc3ffffff | 23 | * node 0: 0xa0000000-0xa3ffffff --> 0xc0000000-0xc3ffffff |