diff options
author | Sascha Laue <Sascha.Laue@gmx.biz> | 2008-04-30 15:16:35 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-04-30 21:54:32 +0200 |
commit | e7419b243a373de4ee042f7d4f45f66de787240d (patch) | |
tree | a05a8d6884f643ed75c0c1009e082d8273d9a699 /post | |
parent | de109d909707e2dfe806be5efc3cdb103b47c8ad (diff) | |
download | u-boot-imx-e7419b243a373de4ee042f7d4f45f66de787240d.zip u-boot-imx-e7419b243a373de4ee042f7d4f45f66de787240d.tar.gz u-boot-imx-e7419b243a373de4ee042f7d4f45f66de787240d.tar.bz2 |
lwmon5: fix manual merge error in POST
Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
Diffstat (limited to 'post')
-rw-r--r-- | post/board/lwmon5/sysmon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c index 793f670..23cb709 100644 --- a/post/board/lwmon5/sysmon.c +++ b/post/board/lwmon5/sysmon.c @@ -132,7 +132,7 @@ static sysmon_table_t sysmon_table[] = { "+ 5 V", "V", &sysmon_dspic, NULL, NULL, - 100, 1000, 0, 0xFFFF, 0xFFFF, + 100, 1000, -0x8000, 0x7FFF, 0xFFFF, VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, REG_VOLTAGE_5V, @@ -140,7 +140,7 @@ static sysmon_table_t sysmon_table[] = { "+ 5 V standby", "V", &sysmon_dspic, NULL, NULL, - 100, 1000, 0, 0xFFFF, 0xFFFF, + 100, 1000, -0x8000, 0x7FFF, 0xFFFF, VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, REG_VOLTAGE_5V_STANDBY, |