diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 04:53:24 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 04:53:24 -0500 |
commit | b1859a23b7bb1ad6f45d35bdad56dbb46fcaef6a (patch) | |
tree | 9bbd6e0fe778c149e4b56aa05d7c3bcbc3e19b04 | |
parent | 564b65eebb5b72c9d4cca77f5612c4a8e8cfe6a1 (diff) | |
parent | d2fa1f37d21bf9729ae9ee79cb6bfc8de1f0a9a4 (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/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 | |||
422 | CONFIG_USB_XHCI_HCD=y | 422 | CONFIG_USB_XHCI_HCD=y |
423 | CONFIG_USB_XHCI_TEGRA=y | 423 | CONFIG_USB_XHCI_TEGRA=y |
424 | CONFIG_USB_EHCI_HCD=y | 424 | CONFIG_USB_EHCI_HCD=y |
425 | CONFIG_USB_EHCI_MSM=y | ||
426 | CONFIG_USB_EHCI_EXYNOS=y | 425 | CONFIG_USB_EHCI_EXYNOS=y |
427 | CONFIG_USB_EHCI_HCD_PLATFORM=y | 426 | CONFIG_USB_EHCI_HCD_PLATFORM=y |
428 | CONFIG_USB_OHCI_HCD=y | 427 | CONFIG_USB_OHCI_HCD=y |
@@ -441,8 +440,6 @@ CONFIG_USB_CHIPIDEA_ULPI=y | |||
441 | CONFIG_USB_ISP1760=y | 440 | CONFIG_USB_ISP1760=y |
442 | CONFIG_USB_HSIC_USB3503=y | 441 | CONFIG_USB_HSIC_USB3503=y |
443 | CONFIG_NOP_USB_XCEIV=y | 442 | CONFIG_NOP_USB_XCEIV=y |
444 | CONFIG_USB_MSM_OTG=y | ||
445 | CONFIG_USB_QCOM_8X16_PHY=y | ||
446 | CONFIG_USB_ULPI=y | 443 | CONFIG_USB_ULPI=y |
447 | CONFIG_USB_GADGET=y | 444 | CONFIG_USB_GADGET=y |
448 | CONFIG_USB_RENESAS_USBHS_UDC=m | 445 | CONFIG_USB_RENESAS_USBHS_UDC=m |