diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /onenand_ipl/board/apollon/apollon.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
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 acf5c2998..4936e00f1 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; |