diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 15:21:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 15:21:11 -0500 |
| commit | e3c0ac04f980750a368f7cd5f1b8d1d2cdc1f735 (patch) | |
| tree | 134501057a244b8ae18b87647a7574e4a36e4b5b /include | |
| parent | 943547abdfe9b4e27e36a25987909619908dffbf (diff) | |
| parent | 6f4a7f4183bdbd02741dcd8edbd10b8628acc5d5 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
PHY: Add the phy_device_release device method.
gianfar: fix compile warning
pasemi_mac: Fix reuse of free'd skb
SMC911X: Fix using of dereferenced skb after netif_rx
sky2: recovery deadlock fix
Fix memory corruption in fec_mpc52xx
Don't claim to do IPv6 checksum offload
cxgb - revert file mode changes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index e10763d79181..554836edd915 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
| @@ -403,6 +403,7 @@ int phy_mii_ioctl(struct phy_device *phydev, | |||
| 403 | int phy_start_interrupts(struct phy_device *phydev); | 403 | int phy_start_interrupts(struct phy_device *phydev); |
| 404 | void phy_print_status(struct phy_device *phydev); | 404 | void phy_print_status(struct phy_device *phydev); |
| 405 | struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id); | 405 | struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id); |
| 406 | void phy_device_free(struct phy_device *phydev); | ||
| 406 | 407 | ||
| 407 | extern struct bus_type mdio_bus_type; | 408 | extern struct bus_type mdio_bus_type; |
| 408 | #endif /* __PHY_H */ | 409 | #endif /* __PHY_H */ |