diff options
Diffstat (limited to 'drivers/net/cs89x0.c')
-rw-r--r-- | drivers/net/cs89x0.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 14624019ce71..2281ebcb400b 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -138,12 +138,12 @@ | |||
138 | #include <linux/ioport.h> | 138 | #include <linux/ioport.h> |
139 | #include <linux/in.h> | 139 | #include <linux/in.h> |
140 | #include <linux/skbuff.h> | 140 | #include <linux/skbuff.h> |
141 | #include <linux/slab.h> | ||
142 | #include <linux/spinlock.h> | 141 | #include <linux/spinlock.h> |
143 | #include <linux/string.h> | 142 | #include <linux/string.h> |
144 | #include <linux/init.h> | 143 | #include <linux/init.h> |
145 | #include <linux/bitops.h> | 144 | #include <linux/bitops.h> |
146 | #include <linux/delay.h> | 145 | #include <linux/delay.h> |
146 | #include <linux/gfp.h> | ||
147 | 147 | ||
148 | #include <asm/system.h> | 148 | #include <asm/system.h> |
149 | #include <asm/io.h> | 149 | #include <asm/io.h> |
@@ -580,7 +580,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) | |||
580 | } | 580 | } |
581 | 581 | ||
582 | #ifdef CONFIG_SH_HICOSH4 | 582 | #ifdef CONFIG_SH_HICOSH4 |
583 | /* truely reset the chip */ | 583 | /* truly reset the chip */ |
584 | writeword(ioaddr, ADD_PORT, 0x0114); | 584 | writeword(ioaddr, ADD_PORT, 0x0114); |
585 | writeword(ioaddr, DATA_PORT, 0x0040); | 585 | writeword(ioaddr, DATA_PORT, 0x0040); |
586 | #endif | 586 | #endif |
@@ -1554,7 +1554,6 @@ static netdev_tx_t net_send_packet(struct sk_buff *skb,struct net_device *dev) | |||
1554 | writewords(dev->base_addr, TX_FRAME_PORT,skb->data,(skb->len+1) >>1); | 1554 | writewords(dev->base_addr, TX_FRAME_PORT,skb->data,(skb->len+1) >>1); |
1555 | spin_unlock_irqrestore(&lp->lock, flags); | 1555 | spin_unlock_irqrestore(&lp->lock, flags); |
1556 | lp->stats.tx_bytes += skb->len; | 1556 | lp->stats.tx_bytes += skb->len; |
1557 | dev->trans_start = jiffies; | ||
1558 | dev_kfree_skb (skb); | 1557 | dev_kfree_skb (skb); |
1559 | 1558 | ||
1560 | /* | 1559 | /* |