diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /include/linux/of_mdio.h | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
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 */ |