diff options
author | Adam Williamson <awilliam@redhat.com> | 2014-09-22 08:59:04 -0700 |
---|---|---|
committer | Adam Williamson <awilliam@redhat.com> | 2014-09-22 08:59:04 -0700 |
commit | 5ddbd85a50d24a625be6b693961633d6fbccd875 (patch) | |
tree | 4b8a130fbb1783b1d2b10cb17562c1e5426b639f /config-x86-generic | |
parent | d1f086f672c30a58085872b828668f851cc70de7 (diff) | |
parent | daec5ad199c2becf783a47c65bb032621d3c5766 (diff) | |
download | kernel-5ddbd85a50d24a625be6b693961633d6fbccd875.tar.gz kernel-5ddbd85a50d24a625be6b693961633d6fbccd875.tar.xz kernel-5ddbd85a50d24a625be6b693961633d6fbccd875.zip |
Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
Diffstat (limited to 'config-x86-generic')
-rw-r--r-- | config-x86-generic | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index 24c92c694..41f4079a7 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -10,10 +10,12 @@ CONFIG_HPET_TIMER=y CONFIG_I8K=m CONFIG_SONYPI_COMPAT=y -CONFIG_MICROCODE=m +CONFIG_MICROCODE=y +CONFIG_MICROCODE_EARLY=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_INTEL_EARLY=y CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_AMD_EARLY=y CONFIG_X86_MSR=y CONFIG_X86_CPUID=y |