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 /post/board/netta | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.gz u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.bz2 | |
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 'post/board/netta')
| -rw-r--r-- | post/board/netta/codec.c | 4 | ||||
| -rw-r--r-- | post/board/netta/dsp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/post/board/netta/codec.c b/post/board/netta/codec.c index 115e331..a095a91 100644 --- a/post/board/netta/codec.c +++ b/post/board/netta/codec.c @@ -33,7 +33,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_CODEC +#if CONFIG_POST & CONFIG_SYS_POST_CODEC extern int board_post_codec(int flags); @@ -42,4 +42,4 @@ int codec_post_test (int flags) return board_post_codec(flags); } -#endif /* CONFIG_POST & CFG_POST_CODEC */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_CODEC */ diff --git a/post/board/netta/dsp.c b/post/board/netta/dsp.c index dcef4e8..438ced5 100644 --- a/post/board/netta/dsp.c +++ b/post/board/netta/dsp.c @@ -33,7 +33,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_DSP +#if CONFIG_POST & CONFIG_SYS_POST_DSP extern int board_post_dsp(int flags); @@ -42,4 +42,4 @@ int dsp_post_test (int flags) return board_post_dsp(flags); } -#endif /* CONFIG_POST & CFG_POST_DSP */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_DSP */ |