From c5080d7e6df6be2d22d719a4295d5857353728e4 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Nov 2012 18:30:49 -0200 Subject: [PATCH] --- yaml --- r: 336555 b: refs/heads/master c: e55b0829cbace88f4b50036432a12146d22cd106 h: refs/heads/master i: 336553: 5194800c8a4652afe74c296e3e3179218e5625bd 336551: 5d252f890f8cef1e6e1663dce6ea4a095fdc127f v: v3 --- [refs] | 2 +- trunk/drivers/of/fdt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 487d33200634..a80bf5b4fbc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c22618a11d1ba2966bd2cfd5e4918ed4f2dad13e +refs/heads/master: e55b0829cbace88f4b50036432a12146d22cd106 diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c index c8be32644c85..135b8083212a 100644 --- a/trunk/drivers/of/fdt.c +++ b/trunk/drivers/of/fdt.c @@ -460,7 +460,7 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node, do { u32 tag = be32_to_cpup((__be32 *)p); - char *pathp; + const char *pathp; p += 4; if (tag == OF_DT_END_NODE) { @@ -488,7 +488,7 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node, pathp = (char *)p; p = ALIGN(p + strlen(pathp) + 1, 4); if ((*pathp) == '/') { - char *lp, *np; + const char *lp, *np; for (lp = NULL, np = pathp; *np; np++) if ((*np) == '/') lp = np+1;