diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
| commit | b4093d6235b7e4249616651ee328600ced48a18a (patch) | |
| tree | 9f5b8e466e2d26fbe13ee7934f9e939a09815bd5 /include/linux/of_mdio.h | |
| parent | d9ab77161d811ffb0bccf396f7155cc905c1b9e1 (diff) | |
| parent | 7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/linux/of_mdio.h')
| -rw-r--r-- | include/linux/of_mdio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h index c9663c690303..53b94e025c7c 100644 --- a/include/linux/of_mdio.h +++ b/include/linux/of_mdio.h | |||
| @@ -18,5 +18,8 @@ extern struct phy_device *of_phy_connect(struct net_device *dev, | |||
| 18 | struct device_node *phy_np, | 18 | struct device_node *phy_np, |
| 19 | void (*hndlr)(struct net_device *), | 19 | void (*hndlr)(struct net_device *), |
| 20 | u32 flags, phy_interface_t iface); | 20 | u32 flags, phy_interface_t iface); |
| 21 | extern struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, | ||
| 22 | void (*hndlr)(struct net_device *), | ||
| 23 | phy_interface_t iface); | ||
| 21 | 24 | ||
| 22 | #endif /* __LINUX_OF_MDIO_H */ | 25 | #endif /* __LINUX_OF_MDIO_H */ |