diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-09-23 07:50:48 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-09-23 07:50:48 -0700 |
| commit | bb5d04d2ed8405126868693faeaebdca246b0e8b (patch) | |
| tree | 841bfa8a250271bd266257e166b7d560d1f35464 /config-x86-generic | |
| parent | 5ddbd85a50d24a625be6b693961633d6fbccd875 (diff) | |
| parent | 9dcf78723c744f491a2a26226fc63b5b92fd07d2 (diff) | |
| download | kernel-bb5d04d2ed8405126868693faeaebdca246b0e8b.tar.gz kernel-bb5d04d2ed8405126868693faeaebdca246b0e8b.tar.xz kernel-bb5d04d2ed8405126868693faeaebdca246b0e8b.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 41f4079a7..75f30faf0 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -420,7 +420,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 |