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-ixp4xx
/
common.c
diff --git
a/arch/arm/mach-ixp4xx/common.c
b/arch/arm/mach-ixp4xx/common.c
index 6600cff6bd922b88984e549fce3d2c406c4939a2..d7223b3b81f3c9d3575c1d72d59cad7851dfed20 100644
(file)
--- a/
arch/arm/mach-ixp4xx/common.c
+++ b/
arch/arm/mach-ixp4xx/common.c
@@
-559,7
+559,7
@@
void ixp4xx_restart(char mode, const char *cmd)
* fallback to the default.
*/
-static void __iomem *ixp4xx_ioremap_caller(
unsigned long
addr, size_t size,
+static void __iomem *ixp4xx_ioremap_caller(
phys_addr_t
addr, size_t size,
unsigned int mtype, void *caller)
{
if (!is_pci_memory(addr))