diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-03-26 08:58:26 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-03-26 08:58:26 +0100 |
| commit | a283b5e337c287e2fce8021aec5ac882623e8227 (patch) | |
| tree | dafc1a120bd928f14ed3691a28f33b0e0a20a392 /config-x86-generic | |
| parent | 8aa57a5d9e615672c90540dd1959c7cd6140b170 (diff) | |
| parent | 846bc92b914931e298b75d5f8ca66c9eac527a74 (diff) | |
| download | kernel-a283b5e337c287e2fce8021aec5ac882623e8227.tar.gz kernel-a283b5e337c287e2fce8021aec5ac882623e8227.tar.xz kernel-a283b5e337c287e2fce8021aec5ac882623e8227.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic index ce2170e5a..29c7aa913 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -19,6 +19,8 @@ CONFIG_MICROCODE_INTEL_EARLY=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_AMD_EARLY=y +CONFIG_PERF_EVENTS_AMD_POWER=m + CONFIG_X86_MSR=y CONFIG_X86_CPUID=y CONFIG_EDD=m @@ -228,6 +230,7 @@ CONFIG_AMILO_RFKILL=m CONFIG_ASUS_LAPTOP=m CONFIG_ASUS_WIRELESS=m CONFIG_COMPAL_LAPTOP=m +CONFIG_DELL_SMBIOS=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_RBTN=m CONFIG_CHROMEOS_LAPTOP=m |