diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-01 07:21:26 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-01 07:21:26 +0100 |
| commit | d61d1e934a975336831d7e2ef89227d369553378 (patch) | |
| tree | d2b79457d4c19f7b3b5a5c0e6d59929652ef83d0 /kernel-x86_64.config | |
| parent | 5d19ee3ff991a88ac78dbdd8f910b6d6f6111071 (diff) | |
| parent | 7072f5716fcbf2bd7d9bbc258baadbe92b4131d3 (diff) | |
| download | kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc29.tar.gz kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc29.tar.xz kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc29.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc29kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc3.git2.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 953d0d99f..eeaf80507 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6314,7 +6314,7 @@ CONFIG_X86_PAT=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_X86_PMEM_LEGACY=y +CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_PTDUMP is not set |