projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
plat-samsung
/
s5p-dev-mfc.c
diff --git
a/arch/arm/plat-samsung/s5p-dev-mfc.c
b/arch/arm/plat-samsung/s5p-dev-mfc.c
index
ad51f85
..
a292728
100644
(file)
--- a/
arch/arm/plat-samsung/s5p-dev-mfc.c
+++ b/
arch/arm/plat-samsung/s5p-dev-mfc.c
@@
-125,8
+125,8
@@
device_initcall(s5p_mfc_memory_init);
int __init s5p_fdt_find_mfc_mem(unsigned long node, const char *uname,
int depth, void *data)
{
- __be32 *prop;
-
unsigned long
len;
+
const
__be32 *prop;
+
int
len;
struct s5p_mfc_dt_meminfo *mfc_mem = data;
if (!data)