summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-07-22 08:31:01 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-07-22 08:31:01 +0100
commitc7dd95a6bb07795d500fb288a61f7974447ed514 (patch)
tree975ba1f7d7ba241249b7b8ac4fece3e00e5695ef /kernel-s390x-debug.config
parentcb88675efe2006563ccda3ab61d59cf1db71568d (diff)
downloadkernel-c7dd95a6bb07795d500fb288a61f7974447ed514.tar.gz
kernel-c7dd95a6bb07795d500fb288a61f7974447ed514.tar.xz
kernel-c7dd95a6bb07795d500fb288a61f7974447ed514.zip
arm updates for 5.3 part 3
Diffstat (limited to 'kernel-s390x-debug.config')
-rw-r--r--kernel-s390x-debug.config3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 20dbd8a7d..945dba589 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3407,6 +3407,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
@@ -3660,7 +3661,6 @@ CONFIG_NOUVEAU_DEBUG_MMU=y
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
@@ -4013,7 +4013,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