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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/usb/host/Kconfig between commit 952230d774bb ("usb: ohci: Fix
Kconfig dependency on USB_ISP1301") from the usb tree and commit
d684f05f2d55 ("ARM: mach-pnx4008: Remove architecture") from the arm-soc
tree.

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

diff --cc drivers/usb/host/Kconfig
index 13cd6d5,276add2..0000000
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -292,7 -292,7 +292,7 @@@ config USB_OHCI_HC
  	depends on USB && USB_ARCH_HAS_OHCI
  	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
  	select USB_OTG_UTILS if ARCH_OMAP
- 	depends on USB_ISP1301 || !(ARCH_LPC32XX || ARCH_PNX4008)
 -	select USB_ISP1301 if ARCH_LPC32XX
++	depends on USB_ISP1301 || !ARCH_LPC32XX
  	---help---
  	  The Open Host Controller Interface (OHCI) is a standard for accessing
  	  USB 1.1 host controller hardware.  It does more in hardware than Intel's

Attachment: pgp00000.pgp
Description: PGP signature