summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-18 09:54:47 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-18 09:54:47 -0400
commit1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb (patch)
tree16d1c0053ed21a9a32849e29702e6d5cc2b327af /config-x86-generic
parent47bb021b79b211ec738da2bd2b9c2d98f630483b (diff)
downloadkernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.tar.gz
kernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.tar.xz
kernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.zip
Linux v4.5-3654-g5cd0911a9e0e
- Fix oops from tsc subsystem (rhbz 1318596) - crypto, security, docs, rproc, dmaengine, powersupply, hsi, vfio, driver-core, tty, char, usb, configfs, ext4, dlm, gfs2, pstore merges
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic
index e67be0b9c..1bbc6df15 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -515,6 +515,7 @@ CONFIG_RCU_FANOUT_LEAF=16
CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=m
CONFIG_INTEL_MEI_TXE=m
+CONFIG_INTEL_MEI_WDT=m
CONFIG_NFC_MEI_PHY=m
CONFIG_NFC_PN544_MEI=m