diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-29 21:33:08 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-29 21:33:08 +0200 |
| commit | ea6f66894f952229eebfc4ad03cd21fe5c8b3f0f (patch) | |
| tree | 4fedd83b8df43012f791f25b5391df1048a96570 /post | |
| parent | 70a0f81412b0b18a6fd0bea960451bc6c2cca49a (diff) | |
post/board/lwmon5/sysmon.c: fix manual merge error.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'post')
| -rw-r--r-- | post/board/lwmon5/sysmon.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c index 9a37b2e8368..793f670e246 100644 --- a/post/board/lwmon5/sysmon.c +++ b/post/board/lwmon5/sysmon.c @@ -127,25 +127,23 @@ static sysmon_table_t sysmon_table[] = 1, 1, -32768, 32767, 0xFFFF, 0x8000 + TEMPERATURE_MIN, 0x8000 + TEMPERATURE_MAX, 0, 0x8000 + TEMPERATURE_DISPLAY_MIN, 0x8000 + TEMPERATURE_DISPLAY_MAX, 0, - REG_TEMPERATURE + REG_TEMPERATURE, }, { "+ 5 V", "V", &sysmon_dspic, NULL, NULL, - 100, 1000, -0x8000, 0x7FFF, 0xFFFF, 100, 1000, 0, 0xFFFF, 0xFFFF, VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, - REG_VOLTAGE_5V + REG_VOLTAGE_5V, }, { "+ 5 V standby", "V", &sysmon_dspic, NULL, NULL, - 100, 1000, -0x8000, 0x7FFF, 0xFFFF, 100, 1000, 0, 0xFFFF, 0xFFFF, VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, - REG_VOLTAGE_5V_STANDBY + REG_VOLTAGE_5V_STANDBY, }, }; static int sysmon_table_size = sizeof(sysmon_table) / sizeof(sysmon_table[0]); |