From: Felipe Balbi <balbi@ti.com>
Date: Fri, 9 Aug 2013 14:31:23 +0000 (+0300)
Subject: Merge branch 'nop-phy-rename' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9e5f9c8aa85da01a7474655dc6af43b5985ad56a;p=linux-beck.git

Merge branch 'nop-phy-rename' into next

Signed-off-by: Felipe Balbi <balbi@ti.com>

Conflicts:
	drivers/usb/phy/phy-generic.c
---

9e5f9c8aa85da01a7474655dc6af43b5985ad56a
diff --cc drivers/usb/phy/phy-generic.c
index f52b7f89eef1,f379b7ded037..406f8e43f852
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@@ -139,12 -139,11 +139,12 @@@ static int nop_set_host(struct usb_otg 
  	return 0;
  }
  
- static int nop_usb_xceiv_probe(struct platform_device *pdev)
+ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
  {
  	struct device *dev = &pdev->dev;
- 	struct nop_usb_xceiv_platform_data *pdata =
 -	struct usb_phy_gen_xceiv_platform_data *pdata = pdev->dev.platform_data;
++	struct usb_phy_gen_xceiv_platform_data *pdata =
 +			dev_get_platdata(&pdev->dev);
- 	struct nop_usb_xceiv	*nop;
+ 	struct usb_phy_gen_xceiv	*nop;
  	enum usb_phy_type	type = USB_PHY_TYPE_USB2;
  	int err;
  	u32 clk_rate = 0;