diff options
author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/net/ethernet/renesas/sh_eth.c | |
parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/renesas/sh_eth.c')
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 5999e961defa..be3c22179161 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
@@ -912,7 +912,7 @@ static int sh_eth_dev_init(struct net_device *ndev) | |||
912 | /* all sh_eth int mask */ | 912 | /* all sh_eth int mask */ |
913 | sh_eth_write(ndev, 0, EESIPR); | 913 | sh_eth_write(ndev, 0, EESIPR); |
914 | 914 | ||
915 | #if defined(__LITTLE_ENDIAN__) | 915 | #if defined(__LITTLE_ENDIAN) |
916 | if (mdp->cd->hw_swap) | 916 | if (mdp->cd->hw_swap) |
917 | sh_eth_write(ndev, EDMR_EL, EDMR); | 917 | sh_eth_write(ndev, EDMR_EL, EDMR); |
918 | else | 918 | else |