aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-01-05 04:53:24 -0500
committerArnd Bergmann <arnd@arndb.de>2018-01-05 04:53:24 -0500
commitb1859a23b7bb1ad6f45d35bdad56dbb46fcaef6a (patch)
tree9bbd6e0fe778c149e4b56aa05d7c3bcbc3e19b04
parent564b65eebb5b72c9d4cca77f5612c4a8e8cfe6a1 (diff)
parentd2fa1f37d21bf9729ae9ee79cb6bfc8de1f0a9a4 (diff)
Merge tag 'qcom-arm64-defconfig-for-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc
Pull "Qualcomm ARM64 Based defconfig Updates for v4.16" from Andy Gross: * Remove legacy QCOM config options
-rw-r--r--arch/arm64/configs/defconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 557acff381ac..99e6cebf77c9 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -422,7 +422,6 @@ CONFIG_USB_OTG=y
422CONFIG_USB_XHCI_HCD=y 422CONFIG_USB_XHCI_HCD=y
423CONFIG_USB_XHCI_TEGRA=y 423CONFIG_USB_XHCI_TEGRA=y
424CONFIG_USB_EHCI_HCD=y 424CONFIG_USB_EHCI_HCD=y
425CONFIG_USB_EHCI_MSM=y
426CONFIG_USB_EHCI_EXYNOS=y 425CONFIG_USB_EHCI_EXYNOS=y
427CONFIG_USB_EHCI_HCD_PLATFORM=y 426CONFIG_USB_EHCI_HCD_PLATFORM=y
428CONFIG_USB_OHCI_HCD=y 427CONFIG_USB_OHCI_HCD=y
@@ -441,8 +440,6 @@ CONFIG_USB_CHIPIDEA_ULPI=y
441CONFIG_USB_ISP1760=y 440CONFIG_USB_ISP1760=y
442CONFIG_USB_HSIC_USB3503=y 441CONFIG_USB_HSIC_USB3503=y
443CONFIG_NOP_USB_XCEIV=y 442CONFIG_NOP_USB_XCEIV=y
444CONFIG_USB_MSM_OTG=y
445CONFIG_USB_QCOM_8X16_PHY=y
446CONFIG_USB_ULPI=y 443CONFIG_USB_ULPI=y
447CONFIG_USB_GADGET=y 444CONFIG_USB_GADGET=y
448CONFIG_USB_RENESAS_USBHS_UDC=m 445CONFIG_USB_RENESAS_USBHS_UDC=m