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 /include/configs/DK1S10_safe_32.h | |
| 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 'include/configs/DK1S10_safe_32.h')
| -rw-r--r-- | include/configs/DK1S10_safe_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/DK1S10_safe_32.h b/include/configs/DK1S10_safe_32.h index 8541a11..ced4ef2 100644 --- a/include/configs/DK1S10_safe_32.h +++ b/include/configs/DK1S10_safe_32.h @@ -29,6 +29,6 @@ * * !!! TODO !!! TODO !!! */ -#error *** CFG_ERROR: DK1S10_safe_32 have to be defined (use DK1S10_standard_32 as template) +#error *** CONFIG_SYS_ERROR: DK1S10_safe_32 have to be defined (use DK1S10_standard_32 as template) #endif /* __CONFIG_DK1S10_SAFE_32_H */ |