diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-27 09:49:03 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-27 09:49:03 -0800 |
| commit | c24cb6c8b501ebdf1aacec7960110a9741a45ced (patch) | |
| tree | c0047443cefd958cda28289c8184ad4604ffa5fc /drivers/usb/phy/phy-generic.h | |
| parent | 043e3f834530e15e89c58c1b7af59cc646700134 (diff) | |
| parent | 2cf93bea3d7b2dbf1e0ebfa9d381aad1b637e2aa (diff) | |
Merge tag 'fixes-for-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v3.13-rc2
First set of fixes for this -rc cycle. A few important
fixes which should be backported to stable kernels and
the usual set of sparse warning fixes. There's also a
regression fix on phy-generic.c which would prevent
am335x-based platforms from having their PHY drivers
probed.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/phy/phy-generic.h')
| -rw-r--r-- | drivers/usb/phy/phy-generic.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-generic.h b/drivers/usb/phy/phy-generic.h index d2a220d8173..38a81f307b8 100644 --- a/drivers/usb/phy/phy-generic.h +++ b/drivers/usb/phy/phy-generic.h @@ -1,6 +1,8 @@ #ifndef _PHY_GENERIC_H_ #define _PHY_GENERIC_H_ +#include <linux/usb/usb_phy_gen_xceiv.h> + struct usb_phy_gen_xceiv { struct usb_phy phy; struct device *dev; @@ -14,6 +16,6 @@ int usb_gen_phy_init(struct usb_phy *phy); void usb_gen_phy_shutdown(struct usb_phy *phy); int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_gen_xceiv *nop, - enum usb_phy_type type, u32 clk_rate, bool needs_vcc); + struct usb_phy_gen_xceiv_platform_data *pdata); #endif |