aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sis900.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-27 02:48:40 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-27 02:48:40 -0500
commit5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch)
tree22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/sis900.c
parent851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff)
parent3ec192559033ed457f0d7856838654c100fc659f (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/hp-plus.c drivers/net/wireless/ath5k/base.c drivers/net/wireless/ath9k/recv.c net/wireless/reg.c
Diffstat (limited to 'drivers/net/sis900.c')
-rw-r--r--drivers/net/sis900.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index eb715f1bcd48..4acd41a093ad 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -1634,7 +1634,6 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
1634 * sis900_interrupt - sis900 interrupt handler 1634 * sis900_interrupt - sis900 interrupt handler
1635 * @irq: the irq number 1635 * @irq: the irq number
1636 * @dev_instance: the client data object 1636 * @dev_instance: the client data object
1637 * @regs: snapshot of processor context
1638 * 1637 *
1639 * The interrupt handler does all of the Rx thread work, 1638 * The interrupt handler does all of the Rx thread work,
1640 * and cleans up after the Tx thread 1639 * and cleans up after the Tx thread