git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
arch-at91rm9200
/
memory.h
diff --git
a/include/asm-arm/arch-at91rm9200/memory.h
b/include/asm-arm/arch-at91rm9200/memory.h
index
462f1f0
..
f985069
100644
(file)
--- a/
include/asm-arm/arch-at91rm9200/memory.h
+++ b/
include/asm-arm/arch-at91rm9200/memory.h
@@
-21,7
+21,7
@@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
-#include <asm/
arch/
hardware.h>
+#include <asm/hardware.h>
#define PHYS_OFFSET (AT91_SDRAM_BASE)
#define PHYS_OFFSET (AT91_SDRAM_BASE)
@@
-33,9
+33,7
@@
* bus_to_virt: Used to convert an address for DMA operations
* to an address that the kernel can use.
*/
* bus_to_virt: Used to convert an address for DMA operations
* to an address that the kernel can use.
*/
-#define __virt_to_bus__is_a_macro
#define __virt_to_bus(x) __virt_to_phys(x)
#define __virt_to_bus(x) __virt_to_phys(x)
-#define __bus_to_virt__is_a_macro
#define __bus_to_virt(x) __phys_to_virt(x)
#endif
#define __bus_to_virt(x) __phys_to_virt(x)
#endif