projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-msm
/
io.c
diff --git
a/arch/arm/mach-msm/io.c
b/arch/arm/mach-msm/io.c
index 123ef9cbce1b2c42f605b3bb19aaacb44dbdd378..fd65b6d42cde0fdaed4efb4397409b4f6e7122d5 100644
(file)
--- a/
arch/arm/mach-msm/io.c
+++ b/
arch/arm/mach-msm/io.c
@@
-172,7
+172,7
@@
void __init msm_map_msm7x30_io(void)
}
#endif /* CONFIG_ARCH_MSM7X30 */
-void __iomem *__msm_ioremap_caller(
unsigned long
phys_addr, size_t size,
+void __iomem *__msm_ioremap_caller(
phys_addr_t
phys_addr, size_t size,
unsigned int mtype, void *caller)
{
if (mtype == MT_DEVICE) {