diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-09-19 19:15:17 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-09-19 19:15:17 +0200 |
| commit | cef136feecb99a08f1ca5bbea0293c9d7d2a6aa4 (patch) | |
| tree | 5b863ce2c7739410213724f0385e439a921f891c /config-x86-generic | |
| parent | 958acb59bea5bec759548502646cf61a9cbf39f7 (diff) | |
| parent | 978e9d5ec43ca50fde1ed6eeaa17a4954b4b814e (diff) | |
| download | kernel-cef136feecb99a08f1ca5bbea0293c9d7d2a6aa4.tar.gz kernel-cef136feecb99a08f1ca5bbea0293c9d7d2a6aa4.tar.xz kernel-cef136feecb99a08f1ca5bbea0293c9d7d2a6aa4.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.8.0-0.rc7.git0.1.vanilla.knurd.1.fc25kernel-4.8.0-0.rc7.git0.1.vanilla.knurd.1.fc24kernel-4.8.0-0.rc7.git0.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/config-x86-generic b/config-x86-generic index 7df9a0751..a44190bd7 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -345,10 +345,6 @@ CONFIG_SPI_PXA2XX=m CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m -CONFIG_CPU_IDLE=y -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set -CONFIG_CPU_IDLE_GOV_MENU=y - CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set @@ -384,7 +380,7 @@ CONFIG_SP5100_TCO=m # CONFIG_MEMTEST is not set # CONFIG_DEBUG_TLBFLUSH is not set -CONFIG_MAXSMP=y +# CONFIG_MAXSMP is not set CONFIG_HP_ILO=m |