diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 13:07:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 13:07:02 -0700 |
| commit | 6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e (patch) | |
| tree | ad5838e0b8ecb22bc5d78fb476d1569ecbe82372 /drivers/acpi/Kconfig | |
| parent | 5c6ba7d53274b5e8b13ecbc727d8eb1ea4a2bcdc (diff) | |
| parent | 2c1175c2e8e5487233cabde358a19577562ac83e (diff) | |
| download | linux-6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e.tar.bz2 | |
Merge tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi
Pull IPMI updates from Corey Minyard:
"A few fixes of things in the IPMI area, the watchdog would have issues
at panic time cause by a recently introduced change, a problem with
device numbering, one possible panic in the I2C driver (destined for
stable).
Nothing earth-shattering, but some things that need to go in"
* tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi:
ipmi/watchdog: fix wdog hang on panic waiting for ipmi response
ipmi_si: use smi_num for init_name
ipmi: bt-bmc: Add ast2500 compatible string
ACPI / IPMI: change warning to debug on timeout
ACPI / IPMI: allow ACPI_IPMI with IPMI_SSIF
ipmi_ssif: use setup_timer
ipmi: Fix kernel panic at ipmi_ssif_thread()
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index a20cfcbee694..c6db511b5f73 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -256,7 +256,7 @@ config ACPI_PROCESSOR config ACPI_IPMI tristate "IPMI" - depends on IPMI_SI + depends on IPMI_HANDLER default n help This driver enables the ACPI to access the BMC controller. And it |