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/pcmcia | |
| 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/pcmcia')
| -rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 0c00d182e7fd..c51cc5d8789a 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
| @@ -1096,7 +1096,6 @@ static void ei_watchdog(u_long arg) | |||
| 1096 | 1096 | ||
| 1097 | /* Check for pending interrupt with expired latency timer: with | 1097 | /* Check for pending interrupt with expired latency timer: with |
| 1098 | this, we can limp along even if the interrupt is blocked */ | 1098 | this, we can limp along even if the interrupt is blocked */ |
| 1099 | outb_p(E8390_NODMA+E8390_PAGE0, nic_base + E8390_CMD); | ||
| 1100 | if (info->stale++ && (inb_p(nic_base + EN0_ISR) & ENISR_ALL)) { | 1099 | if (info->stale++ && (inb_p(nic_base + EN0_ISR) & ENISR_ALL)) { |
| 1101 | if (!info->fast_poll) | 1100 | if (!info->fast_poll) |
| 1102 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); | 1101 | printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name); |