diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-09 09:19:55 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-09 09:19:55 +0200 |
commit | 7ddeb3781f3d79ef1ae5a765a66f6cdd1ec113ef (patch) | |
tree | 3546836f27de4168559a62d8022626dfb101a133 /include/ipmitool/ipmi_strings.h | |
parent | 5bac665e38a15e6725f9ec17c7f7e80a0506aa08 (diff) | |
parent | 82ac6c87ce0b0af2fb8de25d70442fec406bb742 (diff) |
Merge tag 'upstream/1.8.18'
Upstream version 1.8.18
Diffstat (limited to 'include/ipmitool/ipmi_strings.h')
-rw-r--r-- | include/ipmitool/ipmi_strings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/ipmitool/ipmi_strings.h b/include/ipmitool/ipmi_strings.h index 10ec430..63bbea9 100644 --- a/include/ipmitool/ipmi_strings.h +++ b/include/ipmitool/ipmi_strings.h @@ -52,6 +52,7 @@ extern const struct valstr ipmi_auth_algorithms[]; extern const struct valstr ipmi_integrity_algorithms[]; extern const struct valstr ipmi_encryption_algorithms[]; extern const struct valstr ipmi_oem_info[]; +extern const struct valstr ipmi_user_enable_status_vals[]; extern const struct valstr picmg_frucontrol_vals[]; extern const struct valstr picmg_clk_family_vals[]; @@ -68,8 +69,7 @@ extern const struct oemvalstr picmg_busres_shmc_status_vals[]; /* these are similar, expect that the lookup takes the IANA number as first parameter */ extern const struct oemvalstr ipmi_oem_product_info[]; -extern const struct oemvalstr ipmi_oem_sdr_type_vals[]; - - +extern const char *ipmi_generic_sensor_type_vals[]; +extern const struct oemvalstr ipmi_oem_sensor_type_vals[]; #endif /*IPMI_STRINGS_H*/ |