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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 24 Jul 2014 16:38:34 +1000

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/phy/phy-samsung-usb2.c between commit 949ccc3a9363 ("phy: Add
support for S5PV210 to the Exynos USB 2.0 PHY driver") from the samsung
tree and commit 016e0d3cb72c ("drivers: phy: exynos-usb2: add support
for Exynos 3250") from the usb tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/phy/phy-samsung-usb2.c
index 29e4ab987645,ae30640a411d..000000000000
--- a/drivers/phy/phy-samsung-usb2.c
+++ b/drivers/phy/phy-samsung-usb2.c
@@@ -87,12 -87,12 +87,18 @@@ static struct phy *samsung_usb2_phy_xla
  }
  
  static const struct of_device_id samsung_usb2_phy_of_match[] = {
 +#ifdef CONFIG_PHY_S5PV210_USB2
 +	{
 +		.compatible = "samsung,s5pv210-usb2-phy",
 +		.data = &s5pv210_usb2_phy_config,
 +	},
 +#endif
+ #ifdef CONFIG_PHY_EXYNOS4X12_USB2
+ 	{
+ 		.compatible = "samsung,exynos3250-usb2-phy",
+ 		.data = &exynos3250_usb2_phy_config,
+ 	},
+ #endif
  #ifdef CONFIG_PHY_EXYNOS4210_USB2
  	{
  		.compatible = "samsung,exynos4210-usb2-phy",