From: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
To: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
Cc: gregkh-l3A5Bk7waGM@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH] usb: ehci-omap: Update platform header file path
Date: Tue, 15 Dec 2009 13:25:49 -0800 [thread overview]
Message-ID: <20091215212549.GN4575@atomide.com> (raw)
In-Reply-To: <20091204022357.GA19315-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
* Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org> [091203 18:20]:
> The OMAP usb header file will move in the same merge window as this
> driver is getting introduced in, so update the driver now instead of
> making a merge-order-dependent patch later on through linux-omap.
I'll get this merged via omap-fixes queue as it seems like it's not
in Greg's queue.
Regards,
Tony
> Signed-off-by: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
> Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
>
>
> ---
>
> Greg, see below for history (you were Cc:d at the time). Should have
> gone to you in the first place. Sorry for the confusion. Either combine
> with the ehci-omap patch, or merge separate. Thanks!
>
> -Olof
>
>
> On Wed, Nov 25, 2009 at 09:57:39AM -0800, Tony Lindgren wrote:
>
> > The ehci-omap.c driver should be in Greg's queue. I only have the
> > the related platform init code and header changes in my for-next
> > because of the omap header move from mach to plat.
> >
> > IMHO, this fix would be best added to Greg's queue as the ehci-omap.c
> > driver is there [1]. Or just merged into the exisiting patch
> > to keep git bisect working:
> >
> > Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> >
> > Meanwhile, I'll also add this fix to omap-testing and master branches
> > so people can use it until it gets merged.
> >
> > Regards,
> >
> > Tony
> >
> > [1] http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch
>
>
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index 7ba8df3..5cfed78 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -37,7 +37,7 @@
> #include <linux/platform_device.h>
> #include <linux/clk.h>
> #include <linux/gpio.h>
> -#include <mach/usb.h>
> +#include <plat/usb.h>
>
> /*
> * OMAP USBHOST Register addresses: VIRTUAL ADDRESSES
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2009-12-15 21:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-25 9:02 [PATCH] usb: ehci-omap: Update platform header file path Olof Johansson
2009-11-25 9:05 ` Gadiyar, Anand
[not found] ` <5A47E75E594F054BAF48C5E4FC4B92AB030AAC2D5A-/tLxBxkBPtCIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2009-11-25 9:08 ` Olof Johansson
2009-11-25 9:14 ` Olof Johansson
[not found] ` <20091125091456.GA30595-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
2009-11-25 18:06 ` Tony Lindgren
2009-11-25 12:53 ` Greg KH
[not found] ` <20091125125326.GA18175-l3A5Bk7waGM@public.gmane.org>
2009-11-25 17:57 ` Tony Lindgren
[not found] ` <20091125175739.GE4348-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2009-12-04 2:23 ` Olof Johansson
[not found] ` <20091204022357.GA19315-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
2009-12-15 21:25 ` Tony Lindgren [this message]
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=20091215212549.GN4575@atomide.com \
--to=tony-4v6ys6ai5vpbdgjk7y7tuq@public.gmane.org \
--cc=gregkh-l3A5Bk7waGM@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
/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