From: Wolfgang Denk Date: Tue, 29 Apr 2008 19:33:08 +0000 (+0200) Subject: post/board/lwmon5/sysmon.c: fix manual merge error. X-Git-Tag: v1.3.3-rc2~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ea6f66894f952229eebfc4ad03cd21fe5c8b3f0f;p=oweals%2Fu-boot.git post/board/lwmon5/sysmon.c: fix manual merge error. Signed-off-by: Wolfgang Denk --- diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c index 9a37b2e836..793f670e24 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]);