Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / drivers / net / pasemi_mac.c

diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 370c147..8ab6ae0 100644 (file)
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1472,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)