summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl.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-armv7hl.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-armv7hl.config')
-rw-r--r--kernel-armv7hl.config5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e608b7e3d..1718f7775 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4072,7 +4072,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_MELLANOX is not set
CONFIG_NET_VENDOR_MICREL=y
# CONFIG_NET_VENDOR_MICROCHIP is not set
# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -4327,7 +4327,6 @@ CONFIG_NOZOMI=m
CONFIG_NR_CPUS=32
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_NVEC_PAZ00=y
@@ -7122,7 +7121,7 @@ CONFIG_USB_NET_SR9700=m
CONFIG_USB_NET_ZAURUS=m
CONFIG_USB_OHCI_EXYNOS=m
CONFIG_USB_OHCI_HCD_OMAP3=m
-CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PCI=m
CONFIG_USB_OHCI_HCD_PLATFORM=m
CONFIG_USB_OHCI_HCD_STI=m
CONFIG_USB_OHCI_HCD=y