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 branches 'x86-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
drivers
/
net
/
smc-ultra32.c
diff --git
a/drivers/net/smc-ultra32.c
b/drivers/net/smc-ultra32.c
index
7a554ad
..
e459c3b
100644
(file)
--- a/
drivers/net/smc-ultra32.c
+++ b/
drivers/net/smc-ultra32.c
@@
-352,7
+352,6
@@
static void ultra32_reset_8390(struct net_device *dev)
outb(0x84, ioaddr + 5); /* Enable MEM16 & Disable Bus Master. */
outb(0x01, ioaddr + 6); /* Enable Interrupts. */
if (ei_debug > 1) printk("reset done\n");
- return;
}
/* Grab the 8390 specific header. Similar to the block_input routine, but