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 /post/board/netta/codec.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'post/board/netta/codec.c')
| -rw-r--r-- | post/board/netta/codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/post/board/netta/codec.c b/post/board/netta/codec.c index 115e331fd..a095a9179 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 */ |