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/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-imx
/
mm-imx3.c
diff --git
a/arch/arm/mach-imx/mm-imx3.c
b/arch/arm/mach-imx/mm-imx3.c
index e0e69a682174b59ce08e77d2eb11608b596fcf97..eed32ca0b8ab8918db1c28460ed17a90d5b6a083 100644
(file)
--- a/
arch/arm/mach-imx/mm-imx3.c
+++ b/
arch/arm/mach-imx/mm-imx3.c
@@
-65,7
+65,7
@@
static void imx3_idle(void)
: "=r" (reg));
}
-static void __iomem *imx3_ioremap_caller(
unsigned long
phys_addr, size_t size,
+static void __iomem *imx3_ioremap_caller(
phys_addr_t
phys_addr, size_t size,
unsigned int mtype, void *caller)
{
if (mtype == MT_DEVICE) {