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 branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wd.c
diff --git
a/drivers/net/wd.c
b/drivers/net/wd.c
index
b03feae
..
b1ba187
100644
(file)
--- a/
drivers/net/wd.c
+++ b/
drivers/net/wd.c
@@
-127,13
+127,6
@@
static int __init do_wd_probe(struct net_device *dev)
return -ENODEV;
}
return -ENODEV;
}
-static void cleanup_card(struct net_device *dev)
-{
- free_irq(dev->irq, dev);
- release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
- iounmap(ei_status.mem);
-}
-
#ifndef MODULE
struct net_device * __init wd_probe(int unit)
{
#ifndef MODULE
struct net_device * __init wd_probe(int unit)
{
@@
-507,8
+500,8
@@
MODULE_LICENSE("GPL");
/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
-int
-init_module(void)
+
+in
t __init in
it_module(void)
{
struct net_device *dev;
int this_dev, found = 0;
{
struct net_device *dev;
int this_dev, found = 0;
@@
-538,6
+531,13
@@
init_module(void)
return -ENXIO;
}
return -ENXIO;
}
+static void cleanup_card(struct net_device *dev)
+{
+ free_irq(dev->irq, dev);
+ release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
+ iounmap(ei_status.mem);
+}
+
void
cleanup_module(void)
{
void
cleanup_module(void)
{