diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /board/davinci/common/psc.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/davinci/common/psc.c')
| -rw-r--r-- | board/davinci/common/psc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/davinci/common/psc.c b/board/davinci/common/psc.c index 00dc07c..d538d51 100644 --- a/board/davinci/common/psc.c +++ b/board/davinci/common/psc.c @@ -81,7 +81,7 @@ void lpsc_on(unsigned int id) } /* If DSPLINK is used, we don't want U-Boot to power on the DSP. */ -#if !defined(CFG_USE_DSPLINK) +#if !defined(CONFIG_SYS_USE_DSPLINK) void dsp_on(void) { int i; @@ -114,4 +114,4 @@ void dsp_on(void) REG(PSC_GBLCTL) &= ~0x1f; } -#endif /* CFG_USE_DSPLINK */ +#endif /* CONFIG_SYS_USE_DSPLINK */ |