diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-10 07:16:24 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-10 07:16:24 +0200 |
commit | 13d4fee010db62909b0a09e39e93b9afa0af7cd9 (patch) | |
tree | 84ede5e3edd0cb83970bdb221ae1c37dd9a1edba /kernel-i686.config | |
parent | 5f5a79eb3b44919b484325d6e11de3328cf5ebd7 (diff) | |
parent | bd32781ec227f8f38cc748c7769f9678b51db3a4 (diff) | |
download | kernel-4.12.0-0.rc0.git6.1.vanilla.knurd.1.fc25.tar.gz kernel-4.12.0-0.rc0.git6.1.vanilla.knurd.1.fc25.tar.xz kernel-4.12.0-0.rc0.git6.1.vanilla.knurd.1.fc25.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git6.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git6.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git6.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-i686.config')
-rw-r--r-- | kernel-i686.config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 9d56c5e21..d553b5f8f 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3789,6 +3789,10 @@ CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_ECRC=y +CONFIG_PCI_ENDPOINT_CONFIGFS=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_PCI_ENDPOINT=y +# CONFIG_PCI_EPF_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCI_GOANY=y @@ -3805,6 +3809,7 @@ CONFIG_PCIPCWATCHDOG=m CONFIG_PCI_PRI=y # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y +CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y CONFIG_PCMCIA_3C574=m CONFIG_PCMCIA_3C589=m |