Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-omap-h63xx.git] / fs / proc / proc_devtree.c

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index abdf068bc27f4cb9b7699d4a6b478725aa25c180..eca471bc85125626d32c011a820fd828f3124837 100644 (file)
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -38,7 +38,7 @@ static int property_read_proc(char *page, char **start, off_t off,
                n = count;
        else
                *eof = 1;
-       memcpy(page, pp->value + off, n);
+       memcpy(page, (char *)pp->value + off, n);
        *start = page;
        return n;
 }