From 3c0aee084eb24408721da21fc401cd0c389b237b Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 10 Jul 2017 15:28:15 +0200 Subject: [PATCH] ARM: shmobile: defconfig: Replace USB_XHCI_RCAR by USB_XHCI_PLATFORM USB_XHCI_RCAR is no longer enabled, as it now has a dependency on USB_XHCI_PLATFORM, instead of selecting USB_XHCI_PLATFORM. As the latter selects the former if ARCH_RENESAS, fix this by replacing USB_XHCI_RCAR by USB_XHCI_PLATFORM in shmobile_defconfig. Fixes: f879fc32aa0c96fb ("usb: host: xhci-rcar: Avoid long wait in xhci_reset()") Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 297ef8e584f3..d63938024237 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -176,7 +176,7 @@ CONFIG_SND_SOC_AK4642=y CONFIG_SND_SOC_WM8978=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_RCAR=y +CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_R8A66597_HCD=y