Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

[mv-sheeva.git] / drivers / net / pasemi_mac.c

diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index d44d4a208bbf144ceecd4f7ba6dab36d16e6eb38..8ab6ae0a61079dd28f606ce3ca4d637dfdf50e52 100644 (file)
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/dmaengine.h>
 #include <linux/delay.h>
@@ -1471,8 +1472,6 @@ static void pasemi_mac_queue_csdesc(const struct sk_buff *skb,
        txring->next_to_fill = fill;
 
        write_dma_reg(PAS_DMA_TXCHAN_INCR(txring->chan.chno), 2);
-
-       return;
 }
 
 static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)