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 branches 'regulator/topic/supply', 'regulator/topic/tps6105x...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-iop13xx
/
io.c
diff --git
a/arch/arm/mach-iop13xx/io.c
b/arch/arm/mach-iop13xx/io.c
index 183dc8b5511bac36d83a78a3159ca1223192a7ea..faaf7d4482c5d93d58fb72cbcd1a086825117186 100644
(file)
--- a/
arch/arm/mach-iop13xx/io.c
+++ b/
arch/arm/mach-iop13xx/io.c
@@
-23,7
+23,7
@@
#include "pci.h"
-static void __iomem *__iop13xx_ioremap_caller(
unsigned long
cookie,
+static void __iomem *__iop13xx_ioremap_caller(
phys_addr_t
cookie,
size_t size, unsigned int mtype, void *caller)
{
void __iomem * retval;