diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-15 08:17:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-15 08:17:27 -0400 |
| commit | aa2eaa8c272a3211dec07ce9c6c863a7e355c10e (patch) | |
| tree | 8454a23d36b2ff36133c276ee0ba80eabc00850e /drivers/net/wan/lmc/lmc_main.c | |
| parent | a3d3c74da49c65fc63a937fa559186b0e16adca3 (diff) | |
| parent | 1609d7604b847a9820e63393d1a3b6cac7286d40 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes in the btusb and ixgbe drivers.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/lmc/lmc_main.c')
| -rw-r--r-- | drivers/net/wan/lmc/lmc_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index d74349628db2..0e6a51525d91 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c | |||
| @@ -1115,7 +1115,7 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/ | |||
| 1115 | sc->lmc_cmdmode |= (TULIP_CMD_TXRUN | TULIP_CMD_RXRUN); | 1115 | sc->lmc_cmdmode |= (TULIP_CMD_TXRUN | TULIP_CMD_RXRUN); |
| 1116 | LMC_CSR_WRITE (sc, csr_command, sc->lmc_cmdmode); | 1116 | LMC_CSR_WRITE (sc, csr_command, sc->lmc_cmdmode); |
| 1117 | 1117 | ||
| 1118 | lmc_trace(dev, "lmc_runnin_reset_out"); | 1118 | lmc_trace(dev, "lmc_running_reset_out"); |
| 1119 | } | 1119 | } |
| 1120 | 1120 | ||
| 1121 | 1121 | ||