git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-kirkwood
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-kirkwood/include/mach/memory.h
b/arch/arm/mach-kirkwood/include/mach/memory.h
index b5fb34bdccd5a16065fdcfb7fcd74b36ce9650a9..45431e1314652de8ee20b8f41046665c0fa3f2ae 100644
(file)
--- a/
arch/arm/mach-kirkwood/include/mach/memory.h
+++ b/
arch/arm/mach-kirkwood/include/mach/memory.h
@@
-7,8
+7,4
@@
#define PHYS_OFFSET UL(0x00000000)
-#define __virt_to_bus(x) __virt_to_phys(x)
-#define __bus_to_virt(x) __phys_to_virt(x)
-
-
#endif