]> git.sur5r.net Git - u-boot/commitdiff
post/board/lwmon5/sysmon.c: fix manual merge error.
authorWolfgang Denk <wd@denx.de>
Tue, 29 Apr 2008 19:33:08 +0000 (21:33 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Apr 2008 19:33:08 +0000 (21:33 +0200)
Signed-off-by: Wolfgang Denk <wd@denx.de>
post/board/lwmon5/sysmon.c

index 9a37b2e83687fcceca3c925430d9f9c51b43b4a6..793f670e2461032cd0fc0969eddefaae5dd766da 100644 (file)
@@ -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]);