Home » Mailing list archives » linux-kernel » 2011 » January » 4

Re: linux-next: manual merge of the usb tree with the arm tree

Previous thread: linux-next: manual merge of the usb tree with the arm tree by Stephen Rothwell on Monday, January 3, 2011 - 9:55 pm. (2 messages)

Next thread: FROM MRS COMFORT BAKER VERY URGENT by Mrs.Comfort Baker on Monday, January 3, 2011 - 10:32 pm. (1 message)
[view original message]
From: Stephen Rothwell
Subject: linux-next: manual merge of the usb tree with the arm tree
Date: Monday, January 3, 2011 - 9:58 pm

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) && \
--


[ message continues ]
[view original message]
From: Stephen Rothwell
Subject: Re: linux-next: manual merge of the usb tree with the arm tree
Date: Monday, January 3, 2011 - 10:07 pm

Hi Greg,


The fix was not quite right (I left out a "#endif") - I fixed that up.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[ message continues ]
[view original message]
From: Greg KH
Subject: Re: linux-next: manual merge of the usb tree with the arm tree
Date: Monday, January 3, 2011 - 10:29 pm

Thanks for doing this, it looks fine.

greg k-h
--


[ message continues ]
Previous thread: linux-next: manual merge of the usb tree with the arm tree by Stephen Rothwell on Monday, January 3, 2011 - 9:55 pm. (2 messages)

Next thread: FROM MRS COMFORT BAKER VERY URGENT by Mrs.Comfort Baker on Monday, January 3, 2011 - 10:32 pm. (1 message)