Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --git a/cpu/ppc4xx/fdt.c b/cpu/ppc4xx/fdt.c
index 496e0285b5bd802a9445f6df7f0883623d3590a9..b3108327f45a556648900bb27fdd65f58280fe2a 100644 (file)
--- a/cpu/ppc4xx/fdt.c
+++ b/cpu/ppc4xx/fdt.c
@@ -42,7 +42,7 @@ void __ft_board_setup(void *blob, bd_t *bd)
        u32 bxcr;
        u32 ranges[EBC_NUM_BANKS * 4];
        u32 *p = ranges;
-       char *ebc_path = "/plb/opb/ebc";
+       char ebc_path[] = "/plb/opb/ebc";
 
        ft_cpu_setup(blob, bd);