git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
drivers
/
net
/
ne2k-pci.c
diff --git
a/drivers/net/ne2k-pci.c
b/drivers/net/ne2k-pci.c
index
85aec4f
..
3c333cb
100644
(file)
--- a/
drivers/net/ne2k-pci.c
+++ b/
drivers/net/ne2k-pci.c
@@
-631,7
+631,6
@@
static void ne2k_pci_block_output(struct net_device *dev, int count,
outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
ei_status.dmaing &= ~0x01;
- return;
}
static void ne2k_pci_get_drvinfo(struct net_device *dev,