git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[safe/jmp/linux-2.6]
/
drivers
/
net
/
zorro8390.c
diff --git
a/drivers/net/zorro8390.c
b/drivers/net/zorro8390.c
index
9548cbb
..
b78a38d
100644
(file)
--- a/
drivers/net/zorro8390.c
+++ b/
drivers/net/zorro8390.c
@@
-431,7
+431,6
@@
static void zorro8390_block_output(struct net_device *dev, int count,
z_writeb(ENISR_RDC, nic_base + NE_EN0_ISR); /* Ack intr. */
ei_status.dmaing &= ~0x01;
- return;
}
static void __devexit zorro8390_remove_one(struct zorro_dev *z)