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
/
powerpc
/
platforms
/
chrp
/
setup.c
diff --git
a/arch/powerpc/platforms/chrp/setup.c
b/arch/powerpc/platforms/chrp/setup.c
index
c665d7d
..
7044fd3
100644
(file)
--- a/
arch/powerpc/platforms/chrp/setup.c
+++ b/
arch/powerpc/platforms/chrp/setup.c
@@
-574,8
+574,8
@@
chrp_init2(void)
static int __init chrp_probe(void)
{
static int __init chrp_probe(void)
{
- char *dtype = of_get_flat_dt_prop(of_get_flat_dt_root(),
- "device_type", NULL);
+ c
onst c
har *dtype = of_get_flat_dt_prop(of_get_flat_dt_root(),
+
"device_type", NULL);
if (dtype == NULL)
return 0;
if (strcmp(dtype, "chrp"))
if (dtype == NULL)
return 0;
if (strcmp(dtype, "chrp"))