diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-24 13:34:40 -0500 |
commit | 8bd142c01648cdb33e9bcafa0448ba2c20ed814c (patch) | |
tree | 9197c60d3f9d4036f38f281a183e94750ceea1d7 /drivers/net/phy/at803x.c | |
parent | d792abacaf1a1a8dfea353fab699b97fa6251c2a (diff) | |
parent | fbb4574ce9a37e15a9872860bf202f2be5bdf6c4 (diff) |
Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.4-rc3.
Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.
Diffstat (limited to 'drivers/net/phy/at803x.c')
-rw-r--r-- | drivers/net/phy/at803x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index fabf11d32d27..2d020a3ec0b5 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c | |||
@@ -308,6 +308,8 @@ static struct phy_driver at803x_driver[] = { | |||
308 | .flags = PHY_HAS_INTERRUPT, | 308 | .flags = PHY_HAS_INTERRUPT, |
309 | .config_aneg = genphy_config_aneg, | 309 | .config_aneg = genphy_config_aneg, |
310 | .read_status = genphy_read_status, | 310 | .read_status = genphy_read_status, |
311 | .ack_interrupt = at803x_ack_interrupt, | ||
312 | .config_intr = at803x_config_intr, | ||
311 | .driver = { | 313 | .driver = { |
312 | .owner = THIS_MODULE, | 314 | .owner = THIS_MODULE, |
313 | }, | 315 | }, |
@@ -327,6 +329,8 @@ static struct phy_driver at803x_driver[] = { | |||
327 | .flags = PHY_HAS_INTERRUPT, | 329 | .flags = PHY_HAS_INTERRUPT, |
328 | .config_aneg = genphy_config_aneg, | 330 | .config_aneg = genphy_config_aneg, |
329 | .read_status = genphy_read_status, | 331 | .read_status = genphy_read_status, |
332 | .ack_interrupt = at803x_ack_interrupt, | ||
333 | .config_intr = at803x_config_intr, | ||
330 | .driver = { | 334 | .driver = { |
331 | .owner = THIS_MODULE, | 335 | .owner = THIS_MODULE, |
332 | }, | 336 | }, |