Am 22.08.2014 18:59, schrieb Bartlomiej Zolnierkiewicz: > drivers/usb/phy/phy-samsung-usb2 driver got replaced by > drivers/phy/phy-samsung-usb2 one. Remove the leftover hook > from Arndale dts file. > > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> > Acked-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > Reviewed-by: Vivek Gautam <gautam.vivek@xxxxxxxxxxx> > Reviewed-by: Jingoo Han <jg1.han@xxxxxxxxxxx> > Acked-by: Kishon Vijay Abraham I <kishon@xxxxxx> > Cc: Mark Brown <broonie@xxxxxxxxxx> > Cc: Kamil Debski <k.debski@xxxxxxxxxxx> > --- > arch/arm/boot/dts/exynos5250-arndale.dts | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts > index d0de1f5..dad8f9b 100644 > --- a/arch/arm/boot/dts/exynos5250-arndale.dts > +++ b/arch/arm/boot/dts/exynos5250-arndale.dts > @@ -570,8 +570,4 @@ > connect-gpios = <&gpd1 7 1>; > }; > }; > - > - usb@12110000 { > - usb-phy = <&usb2_phy>; > - }; > }; This will trivially conflict with my exynos5250 cleanups in the Spring series: &ehci {...} there. https://patchwork.kernel.org/patch/4664751/ Regards, Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html