summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-02-18 08:59:23 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-02-18 08:59:26 -0500
commitaaccf82ac9cc7dbc44e51e2c4bfc65afe9d07a21 (patch)
tree1ca8497661ca16f0e1fd4c5a9cfb96761f6ffd44
parent869e78e31ac0af40522df04315e0e37894cd888c (diff)
downloadkernel-aaccf82ac9cc7dbc44e51e2c4bfc65afe9d07a21.tar.gz
kernel-aaccf82ac9cc7dbc44e51e2c4bfc65afe9d07a21.tar.xz
kernel-aaccf82ac9cc7dbc44e51e2c4bfc65afe9d07a21.zip
Enable INTEL_MIC drivers (rhbz 1064086)
-rw-r--r--config-x86_64-generic4
-rw-r--r--kernel.spec1
2 files changed, 3 insertions, 2 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index e3fc16dac..dfd56a5b4 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -46,8 +46,8 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y
# CONFIG_INTEL_SCU_IPC is not set
-# CONFIG_INTEL_MIC_HOST is not set
-# CONFIG_INTEL_MIC_CARD is not set
+CONFIG_INTEL_MIC_HOST=m
+CONFIG_INTEL_MIC_CARD=m
# SHPC has half-arsed PCI probing, which makes it load on too many systems
CONFIG_HOTPLUG_PCI_SHPC=m
diff --git a/kernel.spec b/kernel.spec
index 4b6e4ba66..c65c7f81a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2068,6 +2068,7 @@ fi
- Linux v3.14-rc3-20-g60f76ea
- Reenable debugging options.
- Fix r8169 ethernet after suspend (rhbz 1054408)
+- Enable INTEL_MIC drivers (rhbz 1064086)
* Mon Feb 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc3.git0.1
- Linux v3.14-rc3