diff options
| author | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-16 12:39:48 +1100 |
| commit | 24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch) | |
| tree | 08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /drivers/net/sungem_phy.c | |
| parent | e163bc8e4a0cd1cdffadb58253f7651201722d56 (diff) | |
| parent | ff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff) | |
Merge branch 'master'; commit 'v3.2-rc2' into next
Diffstat (limited to 'drivers/net/sungem_phy.c')
| -rw-r--r-- | drivers/net/sungem_phy.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index d16880d7099b..58f13adaa549 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c @@ -33,7 +33,7 @@ #include <asm/prom.h> #endif -#include "sungem_phy.h" +#include <linux/sungem_phy.h> /* Link modes of the BCM5400 PHY */ static const int phy_BCM5400_link_table[8][3] = { @@ -1156,7 +1156,7 @@ static struct mii_phy_def* mii_phy_table[] = { NULL }; -int mii_phy_probe(struct mii_phy *phy, int mii_id) +int sungem_phy_probe(struct mii_phy *phy, int mii_id) { int rc; u32 id; @@ -1195,6 +1195,5 @@ fail: return -ENODEV; } -EXPORT_SYMBOL(mii_phy_probe); +EXPORT_SYMBOL(sungem_phy_probe); MODULE_LICENSE("GPL"); - |