git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-msm/include/mach/io.h
b/arch/arm/mach-msm/include/mach/io.h
index
c35b29f
..
7386e73
100644
(file)
--- a/
arch/arm/mach-msm/include/mach/io.h
+++ b/
arch/arm/mach-msm/include/mach/io.h
@@
-28,6
+28,7
@@
void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int m
void msm_map_qsd8x50_io(void);
void msm_map_msm7x30_io(void);
void msm_map_qsd8x50_io(void);
void msm_map_msm7x30_io(void);
+void msm_map_msm8x60_io(void);
extern unsigned int msm_shared_ram_phys;
extern unsigned int msm_shared_ram_phys;