projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tty-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[cascardo/linux.git]
/
drivers
/
net
/
phy
/
micrel.c
diff --git
a/drivers/net/phy/micrel.c
b/drivers/net/phy/micrel.c
index
053e879
..
885ac9c
100644
(file)
--- a/
drivers/net/phy/micrel.c
+++ b/
drivers/net/phy/micrel.c
@@
-964,7
+964,7
@@
static struct phy_driver ksphy_driver[] = {
.get_strings = kszphy_get_strings,
.get_stats = kszphy_get_stats,
.suspend = genphy_suspend,
- .resume =
gen
phy_resume,
+ .resume =
ksz
phy_resume,
}, {
.phy_id = PHY_ID_KSZ8873MLL,
.phy_id_mask = MICREL_PHY_ID_MASK,