diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-10 19:31:40 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-10 19:31:40 -0800 |
| commit | cd2051e50eb862afffdce13da1b05ef6d7c774e1 (patch) | |
| tree | 4415af7b40d8d89d20a2eb6ca8158ffaba0f9b44 /config-x86-generic | |
| parent | a2d7a54b90ef3d379c3bbb12b4b0e959dab27b14 (diff) | |
| parent | 09115662e15ee83248e62465fead50be5ed85f79 (diff) | |
| download | kernel-cd2051e50eb862afffdce13da1b05ef6d7c774e1.tar.gz kernel-cd2051e50eb862afffdce13da1b05ef6d7c774e1.tar.xz kernel-cd2051e50eb862afffdce13da1b05ef6d7c774e1.zip | |
Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
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 e1da139a3..63d46662f 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -422,7 +422,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 |