Subject: linux-next: manual merge of the usb tree with the tree

From: Mark Brown <[email-masked]>
Date: Wed, 12 Mar 2014 01:05:25 +0000

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in arch/arm/mach-tegra/Kconfig between commit 06c886a95cbb533 ("phy: mvebu-sata: prepare new Dove DT Kconfig variable") from the USB tree and commit ff1f0018cf66 ("drivers: Enable building of Kirkwood drivers for mach-mvebu") from the mvebu tree.

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

diff --cc drivers/phy/Kconfig
index 05711ea4fd15,8d3c49cc500f..000000000000
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -24,7 -27,7 +27,7 @@@ config PHY_EXYNOS_MIPI_VIDE
  
  config PHY_MVEBU_SATA
        def_bool y
-       depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD
 -      depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE
++      depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || MACH_DOVE
        depends on OF
        select GENERIC_PHY