summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ti/davinci_emac.c
diff options
context:
space:
mode:
authorDavid S. Miller2014-05-22 21:17:34 +0200
committerDavid S. Miller2014-05-22 21:17:34 +0200
commitcb421c2845dfb496637dd00c6780682bb3b1e3c5 (patch)
tree2093e6cb47d33d4c3172ad911d29f61a9cc9f987 /drivers/net/ethernet/ti/davinci_emac.c
parentMerge branch 'vlan_features' (diff)
parentpowerpc/fsl: fsl_soc: remove 'fixed-link' parsing code (diff)
downloadkernel-qcow2-linux-cb421c2845dfb496637dd00c6780682bb3b1e3c5.tar.gz
kernel-qcow2-linux-cb421c2845dfb496637dd00c6780682bb3b1e3c5.tar.xz
kernel-qcow2-linux-cb421c2845dfb496637dd00c6780682bb3b1e3c5.zip
Merge branch 'fixed_phy'
Florian Fainelli says: ==================== net: of_phy_connect_fixed_link removal This patch set removes of_phy_connect_fixed_link() from the tree now that we have a better solution for dealing with fixed PHY (emulated PHY) devices for drivers that require them. First two patches update the 'fixed-link' Device Tree binding and drivers to refere to it. Patches 3 to 7 update the in-tree network drivers that use of_phy_connect_fixed_link() Patch 8 removes of_phy_connect_fixed_link Patch 9 removes the PowerPC code that parsed the 'fixed-link' property. Patch 9 can be merged via the net-next tree if the PowerPC folks ack it, but it really has to be merged after the first 8 patches in order to avoid breakage. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/davinci_emac.c')
0 files changed, 0 insertions, 0 deletions