diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/net/phy/phy_device.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'drivers/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 33f7bdb5857c..6da1aa0706a1 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c | |||
| @@ -101,7 +101,6 @@ struct phy_device * get_phy_device(struct mii_bus *bus, int addr) | |||
| 101 | return dev; | 101 | return dev; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | #ifdef CONFIG_PHYCONTROL | ||
| 105 | /* phy_prepare_link: | 104 | /* phy_prepare_link: |
| 106 | * | 105 | * |
| 107 | * description: Tells the PHY infrastructure to handle the | 106 | * description: Tells the PHY infrastructure to handle the |
| @@ -160,8 +159,6 @@ void phy_disconnect(struct phy_device *phydev) | |||
| 160 | } | 159 | } |
| 161 | EXPORT_SYMBOL(phy_disconnect); | 160 | EXPORT_SYMBOL(phy_disconnect); |
| 162 | 161 | ||
| 163 | #endif /* CONFIG_PHYCONTROL */ | ||
| 164 | |||
| 165 | /* phy_attach: | 162 | /* phy_attach: |
| 166 | * | 163 | * |
| 167 | * description: Called by drivers to attach to a particular PHY | 164 | * description: Called by drivers to attach to a particular PHY |