projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
[oweals/u-boot.git]
/
include
/
addr_map.h
diff --git
a/include/addr_map.h
b/include/addr_map.h
index d55f5f64e10d0123982ed7fe9fad0889451ce5cd..dda4d6e710dfa864c4df04745c9753a826ca8b7c 100644
(file)
--- a/
include/addr_map.h
+++ b/
include/addr_map.h
@@
-22,7
+22,7
@@
#include <asm/types.h>
extern phys_addr_t addrmap_virt_to_phys(void *vaddr);
#include <asm/types.h>
extern phys_addr_t addrmap_virt_to_phys(void *vaddr);
-extern
unsigned long
addrmap_phys_to_virt(phys_addr_t paddr);
+extern
void *
addrmap_phys_to_virt(phys_addr_t paddr);
extern void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
phys_size_t size, int idx);
extern void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,
phys_size_t size, int idx);