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-aaec2000 | |
| 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-aaec2000')
| -rw-r--r-- | arch/arm/mach-aaec2000/include/mach/memory.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-aaec2000/include/mach/memory.h b/arch/arm/mach-aaec2000/include/mach/memory.h index 56ae900a482e..c00822543d9f 100644 --- a/arch/arm/mach-aaec2000/include/mach/memory.h +++ b/arch/arm/mach-aaec2000/include/mach/memory.h | |||
| @@ -14,9 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #define PHYS_OFFSET UL(0xf0000000) | 15 | #define PHYS_OFFSET UL(0xf0000000) |
| 16 | 16 | ||
| 17 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 18 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 19 | |||
| 20 | /* | 17 | /* |
| 21 | * The nodes are the followings: | 18 | * The nodes are the followings: |
| 22 | * | 19 | * |