diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-17 10:53:43 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-17 10:53:43 +0200 |
| commit | a9858a4a323769f3d2665ed9d46b48ee404d6d78 (patch) | |
| tree | 7041a3d34ace1eaa7452caee3011f6d7beaa4fb4 /kernel-s390x-debug.config | |
| parent | 7223f046442953e04f61590650257a57eed67e8f (diff) | |
| parent | 186cf004cba1758f86604d266ee0e34526be17ca (diff) | |
| download | kernel-4.19.0-0.rc0.git4.1.vanilla.knurd.1.fc29.tar.gz kernel-4.19.0-0.rc0.git4.1.vanilla.knurd.1.fc29.tar.xz kernel-4.19.0-0.rc0.git4.1.vanilla.knurd.1.fc29.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc0.git4.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc0.git4.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc0.git4.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-s390x-debug.config')
| -rw-r--r-- | kernel-s390x-debug.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 917c5abde..4255fb0cf 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2012,6 +2012,7 @@ CONFIG_IMA_TRUSTED_KEYRING=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set +# CONFIG_IMX_MBOX is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3830,10 +3831,12 @@ CONFIG_PCIE_CADENCE_HOST=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_DW_PLAT_HOST is not set CONFIG_PCIE_ECRC=y +# CONFIG_PCIE_MOBIVEIL is not set # CONFIG_PCI_ENDPOINT is not set # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y +# CONFIG_PCIE_XILINX is not set # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m |