summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-09-26 09:51:18 -0400
committerTom Rini <trini@ti.com>2014-09-26 09:51:18 -0400
commit2c3dc792b6df16970077c0d64085e29f1f85d4c8 (patch)
tree6540d2da40e3f10db89245fe8602470e85237c9e /drivers/net
parentf9860cf081efdf32c8a01b9fc271fe55e2a79f8d (diff)
parent039b77396abb0ed78af34dadbd0786dfaf0e6aa9 (diff)
downloadtalos-obmc-uboot-2c3dc792b6df16970077c0d64085e29f1f85d4c8.tar.gz
talos-obmc-uboot-2c3dc792b6df16970077c0d64085e29f1f85d4c8.zip
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fm/t1040.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c
index bcc871d842..4cce46d7f8 100644
--- a/drivers/net/fm/t1040.c
+++ b/drivers/net/fm/t1040.c
@@ -49,8 +49,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC2) ==
FSL_CORENET_RCWSR13_EC2_FM1_DTSEC5_MII)
return PHY_INTERFACE_MODE_MII;
- else
- return PHY_INTERFACE_MODE_NONE;
}
switch (port) {
OpenPOWER on IntegriCloud