diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-07-26 09:19:44 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-07-26 09:19:44 -0400 |
commit | edee8fca9af42a1fbf53fce50b498e50bcbc8e06 (patch) | |
tree | 29139ef912c09f666898fc8b1033666cbf0e42a9 | |
parent | ebdfef5fb472e85b1abd8cc5e3e92c398e44012a (diff) | |
download | kernel-edee8fca9af42a1fbf53fce50b498e50bcbc8e06.tar.gz kernel-edee8fca9af42a1fbf53fce50b498e50bcbc8e06.tar.xz kernel-edee8fca9af42a1fbf53fce50b498e50bcbc8e06.zip |
Enable Intel MEI driver (rhbz 842444)
-rw-r--r-- | config-x86-generic | 2 | ||||
-rw-r--r-- | kernel.spec | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index bfe01df4a..7f62aa848 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -417,6 +417,8 @@ CONFIG_DRM_GMA3600=y CONFIG_RCU_FANOUT_LEAF=16 +CONFIG_INTEL_MEI=m + # Maybe enable in debug kernels? # CONFIG_DEBUG_NMI_SELFTEST is not set diff --git a/kernel.spec b/kernel.spec index 3da6ad786..0ed9aacee 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2292,6 +2292,9 @@ fi # ||----w | # || || %changelog +* Thu Jul 26 2012 Josh Boyer <jwboyer@redhat.com> +- Enable Intel MEI driver (rhbz 842444) + * Wed Jul 25 2012 Justin M. Forbes <jforbes@redhat.com> - 3.6.0-0.rc0.git2.1 - Linux v3.5-4773-gbdc0077 |