diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-08-22 17:02:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-08-22 17:02:57 +0200 |
commit | 55f569c1a2dfd5737a42fcd4e5dbcd461c0f2d98 (patch) | |
tree | 72697bc56a557638dc667e1275eaaeb90ddd8577 /config-x86-generic | |
parent | 6fa8de77917d42de170fc8ea8d66558209ec4d64 (diff) | |
parent | 114729e728fd81f15d4ee676dbab1f4709c0e357 (diff) | |
download | kernel-55f569c1a2dfd5737a42fcd4e5dbcd461c0f2d98.tar.gz kernel-55f569c1a2dfd5737a42fcd4e5dbcd461c0f2d98.tar.xz kernel-55f569c1a2dfd5737a42fcd4e5dbcd461c0f2d98.zip |
Merge remote-tracking branch 'origin/master'kernel-4.8.0-0.rc3.git0.1.vanilla.knurd.1.fc26kernel-4.8.0-0.rc3.git0.1.vanilla.knurd.1.fc25kernel-4.8.0-0.rc3.git0.1.vanilla.knurd.1.fc24kernel-4.8.0-0.rc3.git0.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-x86-generic')
-rw-r--r-- | config-x86-generic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index 7df9a0751..05465810d 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -384,7 +384,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 |