فهرست منبع

post/board/lwmon5/sysmon.c: fix manual merge error.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk 17 سال پیش
والد
کامیت
ea6f66894f
1فایلهای تغییر یافته به همراه3 افزوده شده و 5 حذف شده
  1. 3 5
      post/board/lwmon5/sysmon.c

+ 3 - 5
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]);