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
/
mach-exynos
/
common.c
diff --git
a/arch/arm/mach-exynos/common.c
b/arch/arm/mach-exynos/common.c
index
f18be40
..
1bf303f
100644
(file)
--- a/
arch/arm/mach-exynos/common.c
+++ b/
arch/arm/mach-exynos/common.c
@@
-322,7
+322,7
@@
static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,
{
struct map_desc iodesc;
__be32 *reg;
-
unsigned long
len;
+
int
len;
if (!of_flat_dt_is_compatible(node, "samsung,exynos4210-chipid") &&
!of_flat_dt_is_compatible(node, "samsung,exynos5440-clock"))