diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-07-03 15:07:56 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-03 15:07:56 +0200 |
| commit | 98c440bee623ecdd5322852732b883e696fb2140 (patch) | |
| tree | ad8b06bc01822cfff8dc53d6651c59c24ac1babe /cpu/mpc85xx/cpu.c | |
| parent | e4feb7638ca0a2138973f14456424acbc332ae43 (diff) | |
| parent | 1f2a05898658900dc5717761e27abf2052e67e13 (diff) | |
| download | u-boot-imx-98c440bee623ecdd5322852732b883e696fb2140.zip u-boot-imx-98c440bee623ecdd5322852732b883e696fb2140.tar.gz u-boot-imx-98c440bee623ecdd5322852732b883e696fb2140.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'cpu/mpc85xx/cpu.c')
| -rw-r--r-- | cpu/mpc85xx/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c index 7735a52..1d791c9 100644 --- a/cpu/mpc85xx/cpu.c +++ b/cpu/mpc85xx/cpu.c @@ -280,7 +280,7 @@ ft_cpu_setup(void *blob, bd_t *bd) if (p != NULL) *p = cpu_to_be32(clock); -#if defined(CONFIG_MPC85XX_TSEC1) +#if defined(CONFIG_TSEC1) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/mac-address", &len); if (p) memcpy(p, bd->bi_enetaddr, 6); |