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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-tegra/Kconfig between commit ddb902cc3459 ("ARM: centralize
common multi-platform kconfig options") from the arm-soc tree and commit
f6723b569a67 ("usb: host: remove selects of USB_ARCH_HAS_?HCI") from the
usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-tegra/Kconfig
index f61cd5b9f103,4926bd11f190..000000000000
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -12,9 -18,10 +12,8 @@@ config ARCH_TEGR
  	select ARCH_HAS_RESET_CONTROLLER
  	select RESET_CONTROLLER
  	select SOC_BUS
- 	select USB_ARCH_HAS_EHCI if USB_SUPPORT
 -	select SPARSE_IRQ
  	select USB_ULPI if USB_PHY
  	select USB_ULPI_VIEWPORT if USB_PHY
 -	select USE_OF
  	help
  	  This enables support for NVIDIA Tegra based systems.
  

Attachment: pgpNfKS3GfwQP.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux