diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
| commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
| tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /drivers/net/wan/hd64570.c | |
| parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) | |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/wan/hd64570.c')
| -rw-r--r-- | drivers/net/wan/hd64570.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c index 4dde2ea4a189..a3ea27ce04f2 100644 --- a/drivers/net/wan/hd64570.c +++ b/drivers/net/wan/hd64570.c | |||
| @@ -658,7 +658,6 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 658 | #endif | 658 | #endif |
| 659 | writew(len, &desc->len); | 659 | writew(len, &desc->len); |
| 660 | writeb(ST_TX_EOM, &desc->stat); | 660 | writeb(ST_TX_EOM, &desc->stat); |
| 661 | dev->trans_start = jiffies; | ||
| 662 | 661 | ||
| 663 | port->txin = next_desc(port, port->txin, 1); | 662 | port->txin = next_desc(port, port->txin, 1); |
| 664 | sca_outw(desc_offset(port, port->txin, 1), | 663 | sca_outw(desc_offset(port, port->txin, 1), |