From: Geert Uytterhoeven Date: Tue, 28 Apr 2015 12:08:04 +0000 (+0200) Subject: ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2 X-Git-Tag: firefly_0821_release~176^2~1554^2~38 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1290a447cf53b5a303d06f74dfb3b65497c92439;p=firefly-linux-kernel-4.4.55.git ARM: multi_v7_defconfig: Replace USB_RCAR_GEN2_PHY by PHY_RCAR_GEN2 The legacy-only USB_RCAR_GEN2_PHY driver was replaced by the DT-only PHY_RCAR_GEN2 driver. Signed-off-by: Geert Uytterhoeven Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 7bb516cd6c14..79bb4422d56d 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -454,7 +454,6 @@ CONFIG_USB_GPIO_VBUS=y CONFIG_USB_ISP1301=y CONFIG_USB_MXS_PHY=y CONFIG_USB_RCAR_PHY=m -CONFIG_USB_RCAR_GEN2_PHY=m CONFIG_USB_GADGET=y CONFIG_USB_RENESAS_USBHS_UDC=m CONFIG_MMC=y @@ -569,6 +568,7 @@ CONFIG_OMAP_USB2=y CONFIG_TI_PIPE3=y CONFIG_PHY_MIPHY28LP=y CONFIG_PHY_MIPHY365X=y +CONFIG_PHY_RCAR_GEN2=m CONFIG_PHY_STIH41X_USB=y CONFIG_PHY_STIH407_USB=y CONFIG_PHY_SUN4I_USB=y