diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-23 23:40:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-23 23:40:17 -0500 |
| commit | c0eea79bd2adcc4708973fdbf72a0a292aa60d71 (patch) | |
| tree | 5736f242252532e65098e13398c9609f256de548 /drivers | |
| parent | adb9c9ac2e82ddbae4f635a9488ea4ee0a88feb6 (diff) | |
| parent | 35eaa31e5d6b0653c11b5661572152295b45b7a7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ifb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 1b699259b4ec..31fb2d75dc44 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c | |||
| @@ -57,7 +57,7 @@ struct ifb_private { | |||
| 57 | struct sk_buff_head tq; | 57 | struct sk_buff_head tq; |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | static int numifbs = 1; | 60 | static int numifbs = 2; |
| 61 | 61 | ||
| 62 | static void ri_tasklet(unsigned long dev); | 62 | static void ri_tasklet(unsigned long dev); |
| 63 | static int ifb_xmit(struct sk_buff *skb, struct net_device *dev); | 63 | static int ifb_xmit(struct sk_buff *skb, struct net_device *dev); |