diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
commit | 818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch) | |
tree | ad3435c3f57c8222ad61709b716168932f13be6c /arch/arm/mach-ep93xx/include/mach/memory.h | |
parent | tracing/kmemtrace: export kmemtrace_mark_alloc_node() / kmemtrace_mark_free() (diff) | |
parent | Merge branch 'linus' into tracing/kmemtrace (diff) | |
download | linux-dev-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.tar.xz linux-dev-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.zip |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'arch/arm/mach-ep93xx/include/mach/memory.h')
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/memory.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h index f1b633590752..5c80c3c8158d 100644 --- a/arch/arm/mach-ep93xx/include/mach/memory.h +++ b/arch/arm/mach-ep93xx/include/mach/memory.h @@ -7,8 +7,4 @@ #define PHYS_OFFSET UL(0x00000000) -#define __bus_to_virt(x) __phys_to_virt(x) -#define __virt_to_bus(x) __virt_to_phys(x) - - #endif |