diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-15 07:23:09 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-15 07:23:09 +0200 |
| commit | 1ddf5a3ca9524870e68910e8f6785581f2955152 (patch) | |
| tree | 8b51a986db0bd2b73e682e6ae8b7e55a12a70c3f /config-generic | |
| parent | 426af3611edfb7a96e386d4e994c7e652d7998a2 (diff) | |
| parent | cc77719c1de4aeb841b98fcc07e407884941626f (diff) | |
| download | kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc26.tar.gz kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc26.tar.xz kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc0.git9.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 774afefba..75696f5af 100644 --- a/config-generic +++ b/config-generic @@ -3247,6 +3247,7 @@ CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_SYSFS=y # CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set CONFIG_SOFT_WATCHDOG=m CONFIG_WDAT_WDT=m CONFIG_WDTPCI=m |