projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de109d9
)
lwmon5: fix manual merge error in POST
author
Sascha Laue
<Sascha.Laue@gmx.biz>
Wed, 30 Apr 2008 13:16:35 +0000
(15:16 +0200)
committer
Wolfgang Denk
<wd@denx.de>
Wed, 30 Apr 2008 19:54:32 +0000
(21:54 +0200)
Signed-off-by: Sascha Laue <sascha.laue@liebherr.com>
post/board/lwmon5/sysmon.c
patch
|
blob
|
history
diff --git
a/post/board/lwmon5/sysmon.c
b/post/board/lwmon5/sysmon.c
index 793f670e2461032cd0fc0969eddefaae5dd766da..23cb70926bb4fe7a7b1a262e6c7d24d64100675f 100644
(file)
--- 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, 0xF
FFF, 0xFFFF,
+ 100, 1000,
-0x8000, 0x7
FFF, 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, 0xF
FFF, 0xFFFF,
+ 100, 1000,
-0x8000, 0x7
FFF, 0xFFFF,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
REG_VOLTAGE_5V_STANDBY,