diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-21 07:00:29 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-21 07:00:29 +0200 |
commit | 5cd3738dff6bc2ec9590abe115b120c624ce59d5 (patch) | |
tree | 40902cfe3c1ea72986412eabf6520881b7606e11 /config-x86-generic | |
parent | 9b2d185c2c65a1a965196f440b315970233b64f9 (diff) | |
parent | f0b1197ecc0f78597071864529c27c896af5c87f (diff) | |
download | kernel-4.7.0-0.rc4.git0.1.vanilla.knurd.1.fc25.tar.gz kernel-4.7.0-0.rc4.git0.1.vanilla.knurd.1.fc25.tar.xz kernel-4.7.0-0.rc4.git0.1.vanilla.knurd.1.fc25.zip |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc4.git0.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc4.git0.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc4.git0.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc4.git0.1.vanilla.knurd.1.fc22
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 b44f9f3da..d7dc0e365 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -381,7 +381,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 |