diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-02 15:01:30 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-02 15:01:30 +0200 |
commit | 2c9c57c1c079a0736af9c31983d7815aee32a71b (patch) | |
tree | abd1eaaf7e5b50fa1fbe46c60643f62e4a7652fc /config-x86-generic | |
parent | 9a7caab0ce49c7c7fafeedc17f0b13f6515289e5 (diff) | |
parent | c1966146c0c0b11f2378e5238b33ecd1f988f390 (diff) | |
download | kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc25.tar.gz kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc25.tar.xz kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc25.zip |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc22
Diffstat (limited to 'config-x86-generic')
-rw-r--r-- | config-x86-generic | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/config-x86-generic b/config-x86-generic index d7dc0e365..ae80650a4 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 is not set +CONFIG_MAXSMP=y CONFIG_HP_ILO=m @@ -437,22 +437,10 @@ CONFIG_GPIO_ICH=m # CONFIG_MFD_DA9055 is not set # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set -# CONFIG_MFD_MAX14577 is not set -# CONFIG_MFD_MAX77686 is not set -# CONFIG_MFD_MAX77693 is not set -# CONFIG_MFD_MAX8907 is not set -# CONFIG_MFD_MAX8997 is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_SEC_CORE is not set # CONFIG_MFD_SMSC is not set # CONFIG_MFD_LP8788 is not set -# CONFIG_MFD_PALMAS is not set -# CONFIG_MFD_TPS65090 is not set -# CONFIG_MFD_TPS65910 is not set -# CONFIG_MFD_TPS65912_I2C is not set -# CONFIG_MFD_TPS80031 is not set -# CONFIG_TWL4030_CORE is not set -# CONFIG_TWL6040_CORE is not set CONFIG_PCI_CNB20LE_QUIRK=y |