git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
drivers
/
net
/
cxgb3
/
vsc8211.c
diff --git
a/drivers/net/cxgb3/vsc8211.c
b/drivers/net/cxgb3/vsc8211.c
index
33f956b
..
d071309
100644
(file)
--- a/
drivers/net/cxgb3/vsc8211.c
+++ b/
drivers/net/cxgb3/vsc8211.c
@@
-262,6
+262,7
@@
static int vsc8211_get_link_status_fiber(struct cphy *cphy, int *link_ok,
return 0;
}
return 0;
}
+#ifdef UNUSED
/*
* Enable/disable auto MDI/MDI-X in forced link speed mode.
*/
/*
* Enable/disable auto MDI/MDI-X in forced link speed mode.
*/
@@
-301,6
+302,7
@@
int vsc8211_set_speed_duplex(struct cphy *phy, int speed, int duplex)
err = vsc8211_set_automdi(phy, 1);
return err;
}
err = vsc8211_set_automdi(phy, 1);
return err;
}
+#endif /* UNUSED */
static int vsc8211_power_down(struct cphy *cphy, int enable)
{
static int vsc8211_power_down(struct cphy *cphy, int enable)
{