diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2019-07-22 08:31:01 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2019-07-22 08:31:01 +0100 |
commit | c7dd95a6bb07795d500fb288a61f7974447ed514 (patch) | |
tree | 975ba1f7d7ba241249b7b8ac4fece3e00e5695ef /kernel-s390x.config | |
parent | cb88675efe2006563ccda3ab61d59cf1db71568d (diff) | |
download | kernel-c7dd95a6bb07795d500fb288a61f7974447ed514.tar.gz kernel-c7dd95a6bb07795d500fb288a61f7974447ed514.tar.xz kernel-c7dd95a6bb07795d500fb288a61f7974447ed514.zip |
arm updates for 5.3 part 3
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 4f1d6f8e0..a52fa39e9 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3386,6 +3386,7 @@ CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_I825XX is not set # CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_MARVELL is not set +CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_MICROSEMI is not set @@ -3639,7 +3640,6 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NR_CPUS=64 CONFIG_NS83820=m # CONFIG_NTB is not set -# CONFIG_NTB_MSI is not set # CONFIG_NTFS_FS is not set CONFIG_NULL_TTY=m # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set @@ -3991,7 +3991,6 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set -# CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set |