diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /include/configs/DK1C20_safe_32.h | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | blackbird-obmc-uboot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz blackbird-obmc-uboot-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'include/configs/DK1C20_safe_32.h')
| -rw-r--r-- | include/configs/DK1C20_safe_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/DK1C20_safe_32.h b/include/configs/DK1C20_safe_32.h index a483e87664..86e4869f13 100644 --- a/include/configs/DK1C20_safe_32.h +++ b/include/configs/DK1C20_safe_32.h @@ -29,6 +29,6 @@ * * !!! TODO !!! TODO !!! */ -#error *** CFG_ERROR: DK1C20_safe_32 have to be defined (use DK1C20_standard_32 as template) +#error *** CONFIG_SYS_ERROR: DK1C20_safe_32 have to be defined (use DK1C20_standard_32 as template) #endif /* __CONFIG_DK1C20_SAFE_32_H */ |
