diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-27 23:46:07 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-27 23:46:07 +0300 |
| commit | 78d51aee04cd20f540c78f1f98f0f9a762ab697a (patch) | |
| tree | ca421cdd7f6a64a9838c3c00b96b5ca5b84372e9 /include | |
| parent | c79a14defb3d8344802115e1b2a62d201354dc18 (diff) | |
| parent | b07b58a3e435a3d18004815e8364ec26c4236721 (diff) | |
| download | linux-78d51aee04cd20f540c78f1f98f0f9a762ab697a.tar.xz | |
Merge tag 'for-linus-4.8' of git://git.code.sf.net/p/openipmi/linux-ipmi
Pull IPMI updates from Corey Minyard:
"Remove some old cruft that was disabled by default a long time ago.
No modern hardware should need this, and anybody who really doesn't
have something to automatically detect IPMI can add the device by hand
on the module commandline or hot add it"
* tag 'for-linus-4.8' of git://git.code.sf.net/p/openipmi/linux-ipmi:
ipmi: remove trydefaults parameter and default init
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ipmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index 838dbfa3c331..78c5d5ae3857 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h @@ -277,7 +277,7 @@ int ipmi_validate_addr(struct ipmi_addr *addr, int len); */ enum ipmi_addr_src { SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS, - SI_PCI, SI_DEVICETREE, SI_DEFAULT + SI_PCI, SI_DEVICETREE, SI_LAST }; const char *ipmi_addr_src_to_str(enum ipmi_addr_src src); |