diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /drivers/net/e100.c | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index e7737d02bb05..03bf164f9e8d 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -1215,7 +1215,7 @@ static void e100_setup_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb | |||
| 1215 | * the literal in the instruction before the code is loaded, the | 1215 | * the literal in the instruction before the code is loaded, the |
| 1216 | * driver can change the algorithm. | 1216 | * driver can change the algorithm. |
| 1217 | * | 1217 | * |
| 1218 | * INTDELAY - This loads the dead-man timer with its inital value. | 1218 | * INTDELAY - This loads the dead-man timer with its initial value. |
| 1219 | * When this timer expires the interrupt is asserted, and the | 1219 | * When this timer expires the interrupt is asserted, and the |
| 1220 | * timer is reset each time a new packet is received. (see | 1220 | * timer is reset each time a new packet is received. (see |
| 1221 | * BUNDLEMAX below to set the limit on number of chained packets) | 1221 | * BUNDLEMAX below to set the limit on number of chained packets) |