From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mac Lin <mkl0301@gmail•com>,
Anton Vorontsov <cbouatmailru@gmail•com>,
Russell King <rmk@arm•linux.org.uk>
Subject: linux-next: manual merge of the usb tree with the arm tree
Date: Tue, 4 Jan 2011 15:58:43 +1100 [thread overview]
Message-ID: <20110104155843.f65f0bcd.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-hcd.c between commit
760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
OHCI bus glue for cns3xxx SOCs") from the arm tree and various commits
from the usb tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/usb/host/ehci-hcd.c
index d0c8f7c,72732da..0000000
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@@ -1216,9 -1229,19 +1229,23 @@@ MODULE_LICENSE ("GPL")
#define PLATFORM_DRIVER ehci_octeon_driver
#endif
+#ifdef CONFIG_USB_CNS3XXX_EHCI
+#include "ehci-cns3xxx.c"
+#define PLATFORM_DRIVER cns3xxx_ehci_driver
++
+ #ifdef CONFIG_ARCH_VT8500
+ #include "ehci-vt8500.c"
+ #define PLATFORM_DRIVER vt8500_ehci_driver
+ #endif
+
+ #ifdef CONFIG_PLAT_SPEAR
+ #include "ehci-spear.c"
+ #define PLATFORM_DRIVER spear_ehci_hcd_driver
+ #endif
+
+ #ifdef CONFIG_USB_EHCI_MSM
+ #include "ehci-msm.c"
+ #define PLATFORM_DRIVER ehci_msm_driver
#endif
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
next reply other threads:[~2011-01-04 4:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 4:58 Stephen Rothwell [this message]
2011-01-04 5:07 ` linux-next: manual merge of the usb tree with the arm tree Stephen Rothwell
2011-01-04 5:29 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2011-01-31 4:53 Stephen Rothwell
2011-01-04 4:55 Stephen Rothwell
2011-01-04 5:29 ` Greg KH
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=20110104155843.f65f0bcd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cbouatmailru@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mkl0301@gmail$(echo .)com \
--cc=rmk@arm$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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