| commit | fd59b48e5a8427c86ee9de162e09c0535def3533 | [log] [tgz] |
|---|---|---|
| author | Stewart Smith <stewart@linux.ibm.com> | Wed May 23 02:37:06 2018 -0500 |
| committer | Stewart Smith <stewart@linux.ibm.com> | Wed May 23 02:37:06 2018 -0500 |
| tree | 5d6a4d199229797f0dbc56debd6b7e407f5ac98b | |
| parent | 042959a264f7349f88397de5040c68aca8124038 [diff] | |
| parent | efa556813e4f2d2c18b2cd1e2fc086f6e708b5e6 [diff] |
Merge remote-tracking branch 'wak-google/linux-watchdog'
diff --git a/openpower/configs/linux/pseries_skiroot_defconfig b/openpower/configs/linux/pseries_skiroot_defconfig index fba487a..aa15294 100644 --- a/openpower/configs/linux/pseries_skiroot_defconfig +++ b/openpower/configs/linux/pseries_skiroot_defconfig
@@ -165,6 +165,7 @@ CONFIG_IPMI_HANDLER=y CONFIG_IPMI_DEVICE_INTERFACE=y CONFIG_IPMI_POWERNV=y +CONFIG_IPMI_WATCHDOG=y CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=1024
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig index 48147d3..2c575ec 100644 --- a/openpower/configs/linux/skiroot_defconfig +++ b/openpower/configs/linux/skiroot_defconfig
@@ -161,6 +161,7 @@ # CONFIG_IPMI_PROC_INTERFACE is not set CONFIG_IPMI_DEVICE_INTERFACE=y CONFIG_IPMI_POWERNV=y +CONFIG_IPMI_WATCHDOG=y CONFIG_HW_RANDOM=y CONFIG_TCG_TIS_I2C_NUVOTON=y # CONFIG_I2C_COMPAT is not set