diff options
| author | dim <dim@FreeBSD.org> | 2015-02-22 16:04:37 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-22 16:04:37 +0000 |
| commit | 9bd5a747dd2c968d97a8932065fb94723bbeae9c (patch) | |
| tree | 62a36bf13e95aeb90982314c4943a29b289e60ee /sys/dev/sfxge/common/efx_mon.c | |
| parent | 1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3 (diff) | |
| parent | 88c4104dd7fac3a58708a6de5dcd21610a7f0316 (diff) | |
| download | FreeBSD-src-9bd5a747dd2c968d97a8932065fb94723bbeae9c.zip FreeBSD-src-9bd5a747dd2c968d97a8932065fb94723bbeae9c.tar.gz | |
Merge ^/head r279023 through r279162.
Diffstat (limited to 'sys/dev/sfxge/common/efx_mon.c')
| -rw-r--r-- | sys/dev/sfxge/common/efx_mon.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sys/dev/sfxge/common/efx_mon.c b/sys/dev/sfxge/common/efx_mon.c index 5d397c3..dc2e256 100644 --- a/sys/dev/sfxge/common/efx_mon.c +++ b/sys/dev/sfxge/common/efx_mon.c @@ -195,7 +195,7 @@ fail1: #if EFSYS_OPT_NAMES -/* START MKCONFIG GENERATED MonitorStatNamesBlock 08518fd1fb4e2612 */ +/* START MKCONFIG GENERATED MonitorStatNamesBlock 89ff37f1d74ad8b3 */ static const char __cs * __cs __mon_stat_name[] = { "value_2_5v", "value_vccp1", @@ -213,6 +213,20 @@ static const char __cs * __cs __mon_stat_name[] = { "1_2v", "1_8v", "3_3v", + "1_2va", + "vref", + "vaoe", + "aoe_temperature", + "psu_aoe_temperature", + "psu_temperature", + "fan0", + "fan1", + "fan2", + "fan3", + "fan4", + "vaoe_in", + "iaoe", + "iaoe_in", }; /* END MKCONFIG GENERATED MonitorStatNamesBlock */ |
