diff options
| author | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-29 18:08:02 -0400 |
|---|---|---|
| committer | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-29 18:08:02 -0400 |
| commit | 3596d55eb22703d3f4f1b839fe4b000fabe081b3 (patch) | |
| tree | 96d1ce693dc72c2fbc63da37928afd4761e82fd2 /cpu/mpc8260/cpu.c | |
| parent | 493a2b1dc97367e904bf83869501f6290f3b374e (diff) | |
| parent | 74d1e66d22dac91388bc538b2fe19f735edc5b82 (diff) | |
| download | u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.zip u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.tar.gz u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.tar.bz2 | |
Merge git://www.denx.de/git/u-boot into uboot
Diffstat (limited to 'cpu/mpc8260/cpu.c')
| -rw-r--r-- | cpu/mpc8260/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index 55e61a1..414759e 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -300,7 +300,7 @@ void watchdog_reset (void) #endif /* CONFIG_WATCHDOG */ /* ------------------------------------------------------------------------- */ -#if defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP) void ft_cpu_setup (void *blob, bd_t *bd) { char * cpu_path = "/cpus/" OF_CPU; |