From d994512dffd7cabd2af68dfe75aedf8b2ba50ffb Mon Sep 17 00:00:00 2001
From: Andrey Konovalov <andreyknvl@google.com>
Date: Wed, 4 Sep 2019 13:07:27 +0200
Subject: sys/linux, dashboard: update USB config

---
 dashboard/config/upstream-usb.config | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'dashboard')

diff --git a/dashboard/config/upstream-usb.config b/dashboard/config/upstream-usb.config
index 0ca7716b4..625e385e7 100644
--- a/dashboard/config/upstream-usb.config
+++ b/dashboard/config/upstream-usb.config
@@ -10,7 +10,7 @@ CONFIG_DEBUG_AID_FOR_SYZBOT=y
 
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.3.0-rc2 Kernel Configuration
+# Linux/x86 5.3.0-rc7 Kernel Configuration
 #
 
 #
@@ -4908,9 +4908,6 @@ CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_LEDS_TRIGGER_USBPORT=y
 CONFIG_USB_AUTOSUSPEND_DELAY=2
 CONFIG_USB_MON=y
-CONFIG_USB_WUSB=y
-CONFIG_USB_WUSB_CBAF=y
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
 
 #
 # USB Host Controller Drivers
@@ -4940,8 +4937,6 @@ CONFIG_USB_SL811_HCD=y
 CONFIG_USB_SL811_HCD_ISO=y
 CONFIG_USB_SL811_CS=y
 CONFIG_USB_R8A66597_HCD=y
-CONFIG_USB_WHCI_HCD=y
-CONFIG_USB_HWA_HCD=y
 CONFIG_USB_HCD_BCMA=y
 CONFIG_USB_HCD_SSB=y
 # CONFIG_USB_HCD_TEST_MODE is not set
@@ -4991,6 +4986,7 @@ CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=y
 CONFIG_USBIP_VUDC=y
 # CONFIG_USBIP_DEBUG is not set
+# CONFIG_USB_CDNS3 is not set
 CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_MUSB_HOST is not set
 # CONFIG_USB_MUSB_GADGET is not set
@@ -5229,10 +5225,6 @@ CONFIG_USB_ROLE_SWITCH=y
 # CONFIG_USB_ROLES_INTEL_XHCI is not set
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=y
-CONFIG_UWB=y
-CONFIG_UWB_HWA=y
-CONFIG_UWB_WHCI=y
-CONFIG_UWB_I1480U=y
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y
 # CONFIG_PWRSEQ_SD8787 is not set
@@ -5703,6 +5695,15 @@ CONFIG_GIGASET_M105=y
 # CONFIG_HYSDN is not set
 # end of ISDN CAPI drivers
 
+CONFIG_USB_WUSB=y
+CONFIG_USB_WUSB_CBAF=y
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+CONFIG_USB_WHCI_HCD=y
+CONFIG_USB_HWA_HCD=y
+CONFIG_UWB=y
+CONFIG_UWB_HWA=y
+CONFIG_UWB_WHCI=y
+CONFIG_UWB_I1480U=y
 CONFIG_X86_PLATFORM_DEVICES=y
 # CONFIG_ACER_WMI is not set
 # CONFIG_ACER_WIRELESS is not set
@@ -5884,13 +5885,6 @@ CONFIG_HYPERV_IOMMU=y
 #
 # end of i.MX SoC drivers
 
-#
-# IXP4xx SoC drivers
-#
-# CONFIG_IXP4XX_QMGR is not set
-# CONFIG_IXP4XX_NPE is not set
-# end of IXP4xx SoC drivers
-
 #
 # Qualcomm SoC drivers
 #
-- 
cgit mrf-deployment