From: Lucas Stach <dev@lynxeye.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 7/8] tegra: usb: move implementation into right directory
Date: Tue, 30 Oct 2012 14:38:46 +0100 [thread overview]
Message-ID: <1351604326.1434.37.camel@tellur> (raw)
In-Reply-To: <CAPnjgZ1PSHdr1-rBYArYnFhnmnD_EzxY=GVFXdh97AkHCk6vKg@mail.gmail.com>
Am Dienstag, den 30.10.2012, 06:33 -0700 schrieb Simon Glass:
> 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.
The series based on u-boot-usb/master, as it's supposed to go in through
this tree.
Regards,
Lucas
next prev parent reply other threads:[~2012-10-30 13:38 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 9:22 [U-Boot] [PATCH 1/8] tegra: usb: convert USB_PORTS_MAX to be a define Lucas Stach
2012-10-30 9:22 ` [U-Boot] [PATCH 2/8] tegra: usb: make controller init functions more self contained Lucas Stach
2012-10-30 13:03 ` Simon Glass
2012-10-30 13:16 ` Lucas Stach
2012-10-30 15:35 ` Simon Glass
2012-10-30 9:22 ` [U-Boot] [PATCH 3/8] tegra: usb: fold initial pll setup into board_usb_init Lucas Stach
2012-10-30 13:23 ` Simon Glass
2012-10-30 13:32 ` Lucas Stach
2012-10-30 9:22 ` [U-Boot] [PATCH 4/8] tegra: usb: remove unneeded function parameter Lucas Stach
2012-10-30 13:18 ` Simon Glass
2012-10-30 9:22 ` [U-Boot] [PATCH 5/8] tegra: usb: move controller init into start_port Lucas Stach
2012-10-30 10:59 ` Marek Vasut
2012-10-30 12:12 ` Lucas Stach
2012-10-30 12:33 ` Marek Vasut
2012-10-30 12:44 ` Lucas Stach
2012-10-30 18:34 ` Stephen Warren
2012-10-30 13:27 ` Simon Glass
2012-10-30 13:37 ` Lucas Stach
2012-10-30 13:48 ` Simon Glass
2012-10-30 13:54 ` Lucas Stach
2012-10-30 14:03 ` Simon Glass
2012-10-30 9:22 ` [U-Boot] [PATCH 6/8] tegra: usb: various small cleanups Lucas Stach
2012-10-30 13:31 ` Simon Glass
2012-10-30 9:22 ` [U-Boot] [PATCH 7/8] tegra: usb: move implementation into right directory Lucas Stach
2012-10-30 13:33 ` Simon Glass
2012-10-30 13:38 ` Lucas Stach [this message]
2012-10-30 13:53 ` Simon Glass
2012-10-30 14:03 ` Lucas Stach
2012-10-30 16:11 ` Tom Warren
2012-10-30 16:18 ` Simon Glass
2012-10-30 18:38 ` Stephen Warren
2012-10-30 18:45 ` Lucas Stach
2012-10-30 18:51 ` Stephen Warren
2012-10-30 18:58 ` Lucas Stach
2012-10-30 9:22 ` [U-Boot] [PATCH 8/8] tegra: usb: move [start|stop]_port into ehci_hcd_[init|stop] Lucas Stach
2012-10-30 13:39 ` Simon Glass
2012-10-30 13:09 ` [U-Boot] [PATCH 1/8] tegra: usb: convert USB_PORTS_MAX to be a define Simon Glass
2012-10-30 13:11 ` Marek Vasut
2012-10-30 13:40 ` Simon Glass
2012-11-02 20:41 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351604326.1434.37.camel@tellur \
--to=dev@lynxeye.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox