linux-next: manual merge of the usb tree with the usb.current tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-fsl.h between commit 71919403dc86 ("Revert
"powerpc/usb: fix issue of CPU halt when missing USB PHY clock"") from
the usb.current tree and commit 28c56ea14314 ("powerpc/usb: fix bug of
kernel hang when initializing usb") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/host/ehci-fsl.h
index 4918062,863fb0c..0000000
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@@ -45,5 -47,7 +47,6 @@@
  #define FSL_SOC_USB_PRICTRL	0x40c	/* NOTE: big-endian */
  #define FSL_SOC_USB_SICTRL	0x410	/* NOTE: big-endian */
  #define FSL_SOC_USB_CTRL	0x500	/* NOTE: big-endian */
+ #define CTRL_UTMI_PHY_EN	(1<<9)
 -#define CTRL_PHY_CLK_VALID	(1 << 17)
  #define SNOOP_SIZE_2GB		0x1e
  #endif				/* _EHCI_FSL_H */

Attachment: pgp00000.pgp
Description: PGP signature