Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aef1c3d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sa415m: Disable USB host drivers"

parents 2aa8d916 daaff4dd

arch/arm/configs/sa415m-perf_defconfig

+2 −11
Original line number Diff line number Diff line
@@ -214,14 +214,12 @@ CONFIG_KS8851=y 
# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_PHYLIB=y

CONFIG_AT803X_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_PPP=y

CONFIG_PPPOL2TP=y

CONFIG_PPP_ASYNC=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CNSS2=y

CONFIG_CNSS2_DEBUG=y
@@ -294,20 +292,13 @@ CONFIG_REGULATOR_RPMH=y 
CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_SOC_TLV320AIC3X=y

# CONFIG_HID_GENERIC is not set

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_ACM=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3_MSM=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MSM_SSPHY_QMP=y

CONFIG_MSM_HSUSB_PHY=y

arch/arm/configs/sa415m_defconfig

+2 −24
Original line number Diff line number Diff line
@@ -214,14 +214,12 @@ CONFIG_KS8851=y 
# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_PHYLIB=y

CONFIG_AT803X_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_PPP=y

CONFIG_PPPOL2TP=y

CONFIG_PPP_ASYNC=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CNSS2=y

CONFIG_CNSS2_DEBUG=y
@@ -300,8 +298,7 @@ CONFIG_FB_MSM_QPIC_PANEL_DETECT=y 
CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_SOC_TLV320AIC3X=y

CONFIG_UHID=y
@@ -311,27 +308,8 @@ CONFIG_HID_MAGICMOUSE=y 
CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_DEBUG=y

CONFIG_USB_STORAGE_DATAFAB=y

CONFIG_USB_STORAGE_FREECOM=y

CONFIG_USB_STORAGE_ISD200=y

CONFIG_USB_STORAGE_USBAT=y

CONFIG_USB_STORAGE_SDDR09=y

CONFIG_USB_STORAGE_SDDR55=y

CONFIG_USB_STORAGE_JUMPSHOT=y

CONFIG_USB_STORAGE_ALAUDA=y

CONFIG_USB_STORAGE_ONETOUCH=y

CONFIG_USB_STORAGE_KARMA=y

CONFIG_USB_STORAGE_CYPRESS_ATACB=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3_MSM=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MSM_SSPHY_QMP=y

CONFIG_MSM_HSUSB_PHY=y