projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
[powerpc.git]
/
drivers
/
net
/
e2100.c
diff --git
a/drivers/net/e2100.c
b/drivers/net/e2100.c
index
f5a4dd7
..
e5c5cd2
100644
(file)
--- a/
drivers/net/e2100.c
+++ b/
drivers/net/e2100.c
@@
-140,13
+140,6
@@
static int __init do_e2100_probe(struct net_device *dev)
return -ENODEV;
}
return -ENODEV;
}
-static void cleanup_card(struct net_device *dev)
-{
- /* NB: e21_close() handles free_irq */
- iounmap(ei_status.mem);
- release_region(dev->base_addr, E21_IO_EXTENT);
-}
-
#ifndef MODULE
struct net_device * __init e2100_probe(int unit)
{
#ifndef MODULE
struct net_device * __init e2100_probe(int unit)
{
@@
-463,6
+456,13
@@
init_module(void)
return -ENXIO;
}
return -ENXIO;
}
+static void cleanup_card(struct net_device *dev)
+{
+ /* NB: e21_close() handles free_irq */
+ iounmap(ei_status.mem);
+ release_region(dev->base_addr, E21_IO_EXTENT);
+}
+
void
cleanup_module(void)
{
void
cleanup_module(void)
{