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 /onenand_ipl/board/apollon/apollon.c | |
| 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 'onenand_ipl/board/apollon/apollon.c')
| -rw-r--r-- | onenand_ipl/board/apollon/apollon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/onenand_ipl/board/apollon/apollon.c b/onenand_ipl/board/apollon/apollon.c index acf5c2998f..4936e00f17 100644 --- a/onenand_ipl/board/apollon/apollon.c +++ b/onenand_ipl/board/apollon/apollon.c @@ -37,7 +37,7 @@ int board_init(void) return 0; } -#ifdef CFG_PRINTF +#ifdef CONFIG_SYS_PRINTF /* Pin Muxing registers used for UART1 */ /**************************************** * Routine: muxSetupUART1 (ostboot) @@ -63,7 +63,7 @@ static void muxSetupUART1(void) **********************************************************/ int s_init(int skip) { -#ifdef CFG_PRINTF +#ifdef CONFIG_SYS_PRINTF muxSetupUART1(); #endif return 0; |
