[U-Boot] [PATCH 7/8] tegra: usb: move implementation into right directory

Simon Glass
2012-10-30T13:33:49Z

Hi Lucas,

On Tue, Oct 30, 2012 at 2:22 AM, Lucas Stach <dev@lynxeye.de> wrote:
> This moves the Tegra USB implementation into the drivers/usb/host
> directory.
>
> Signed-off-by: Lucas Stach <dev@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