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/lwmon5/sysmon.c | |
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/lwmon5/sysmon.c')
-rw-r--r-- | post/board/lwmon5/sysmon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c index 2766224..aef5bd0 100644 --- a/post/board/lwmon5/sysmon.c +++ b/post/board/lwmon5/sysmon.c @@ -51,7 +51,7 @@ #include <mb862xx.h> #endif -#if CONFIG_POST & CFG_POST_SYSMON +#if CONFIG_POST & CONFIG_SYS_POST_SYSMON DECLARE_GLOBAL_DATA_PTR; @@ -90,7 +90,7 @@ struct sysmon_s }; static sysmon_t sysmon_dspic = - {CFG_I2C_DSPIC_IO_ADDR, sysmon_dspic_init, sysmon_dspic_read}; + {CONFIG_SYS_I2C_DSPIC_IO_ADDR, sysmon_dspic_init, sysmon_dspic_read}; static sysmon_t * sysmon_list[] = { @@ -267,4 +267,4 @@ int sysmon_post_test (int flags) return res; } -#endif /* CONFIG_POST & CFG_POST_SYSMON */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_SYSMON */ |