Hi Lucas, On Tue, Oct 30, 2012 at 2:22 AM, Lucas Stach <d...@lynxeye.de> wrote: > This moves the Tegra USB implementation into the drivers/usb/host > directory. > > Signed-off-by: Lucas Stach <d...@lynxeye.de> > --- > arch/arm/cpu/armv7/tegra20/Makefile | 2 - > .../tegra20/usb.c => drivers/usb/host/ehci-tegra.c | 60 > ++++++++++++++++++++-- > 2 Dateien geändert, 55 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) > rename arch/arm/cpu/armv7/tegra20/usb.c => drivers/usb/host/ehci-tegra.c > (92%)
For me this patch did not apply: Applying: tegra: usb: move implementation into right directory error: drivers/usb/host/ehci-tegra.c: already exists in index Patch failed at 0007 tegra: usb: move implementation into right directory When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". I tried master and tegra/master. Regards, Simon _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
