summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64.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-x86_64.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-x86_64.config')
-rw-r--r--kernel-x86_64.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index b2b22f988..82d548c60 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3741,6 +3741,7 @@ CONFIG_NET_VENDOR_GOOGLE=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
CONFIG_NET_VENDOR_MICREL=y
# CONFIG_NET_VENDOR_MICROCHIP is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -4409,7 +4410,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