diff options
| author | Ingo Molnar | 2013-12-16 14:51:32 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2013-12-16 14:51:32 +0100 |
| commit | fe361cfcf40ad4612226347573a8669cd0d44799 (patch) | |
| tree | e874ef5a29c3bfe3dd67dc2d8962562c00fc8e3a /drivers/usb/phy/phy-generic.h | |
| parent | perf: Optimize ring-buffer write by depending on control dependencies (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.tar.gz kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.tar.xz kernel-qcow2-linux-fe361cfcf40ad4612226347573a8669cd0d44799.zip | |
Merge tag 'v3.13-rc4' into perf/core
Merge Linux 3.13-rc4, to refresh this branch with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 d2a220d81734..38a81f307b82 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 |