| commit | 67a7e870c8039b58879e66b5c7bb7d19eb15c5af | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Fri Jul 06 10:38:28 2007 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Fri Jul 06 10:38:28 2007 +0200 |
| tree | 3a2d693997fad34fd049a56518dbb44195342392 | |
| parent | fbab50f7ae1d015ab13009d600accbcde0cf51f8 [diff] | |
| parent | 15888b41705f77f7561a1a82d46334dfd8b9bc10 [diff] |
Merge with git://www.denx.de/git/u-boot-testing
diff --git a/cpu/ppc4xx/dcr.S b/cpu/ppc4xx/dcr.S index 7102364..554db1b 100644 --- a/cpu/ppc4xx/dcr.S +++ b/cpu/ppc4xx/dcr.S
@@ -22,7 +22,7 @@ */ #include <config.h> -#if defined(CONFIG_4xx) && defined(CFG_CMD_SETGETDCR) +#if defined(CONFIG_4xx) && ((CONFIG_COMMANDS & CFG_CMD_SETGETDCR) || defined(CONFIG_CMD_SETGETDCR)) #include <ppc4xx.h>