phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lwmon5: fix manual merge error in POST 

Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
This commit is contained in:
Sascha Laue 2008-04-30 15:16:35 +02:00 committed by Wolfgang Denk
parent de109d9097
commit e7419b243a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
post/board/lwmon5/sysmon.c
View File

@ -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,