diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 10:53:24 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 10:53:24 +0100 |
commit | b1859a23b7bb1ad6f45d35bdad56dbb46fcaef6a (patch) | |
tree | 9bbd6e0fe778c149e4b56aa05d7c3bcbc3e19b04 | |
parent | Merge tag 'sunxi-config64-for-4.16' of https://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | arm64: defconfig: remove CONFIG_USB_QCOM_8X16_PHY (diff) | |
download | linux-b1859a23b7bb1ad6f45d35bdad56dbb46fcaef6a.tar.xz linux-b1859a23b7bb1ad6f45d35bdad56dbb46fcaef6a.zip |
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/defconfig | 3 |
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 CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_TEGRA=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MSM=y CONFIG_USB_EHCI_EXYNOS=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD=y @@ -441,8 +440,6 @@ CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_USB_ISP1760=y CONFIG_USB_HSIC_USB3503=y CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_MSM_OTG=y -CONFIG_USB_QCOM_8X16_PHY=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_USB_RENESAS_USBHS_UDC=m |