diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-26 07:37:20 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-26 07:37:20 +0100 |
| commit | c0c5e7bc636644376b969efd5d90951c7b88a495 (patch) | |
| tree | 593fe893af47bf7d552ad6feb6094150aad94fed /config-x86-generic | |
| parent | c1595c4d2c7d37dc88e2d0b11205f641f9a857fc (diff) | |
| parent | 04cf44e3c826554975d6f91e36402069c8e931b7 (diff) | |
| download | kernel-c0c5e7bc636644376b969efd5d90951c7b88a495.tar.gz kernel-c0c5e7bc636644376b969efd5d90951c7b88a495.tar.xz kernel-c0c5e7bc636644376b969efd5d90951c7b88a495.zip | |
Merge remote-tracking branch 'origin/master' into f22-user-thl-vanilla-rawhidekernel-4.5.0-0.rc1.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 595c03e02..9404c2d77 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -377,7 +377,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 |