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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 4 Jan 2011 15:58:43 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mac Lin <mkl0301@...il.com>,
	Anton Vorontsov <cbouatmailru@...il.com>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the usb tree with the arm tree

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@...b.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) && \
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/