Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index 5c5eebdb6914..dcc98afa65d7 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -148,14 +148,6 @@ el2_pio_probe(struct net_device *dev)
     return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-        /* NB: el2_close() handles free_irq */
-        release_region(dev->base_addr, EL2_IO_EXTENT);
-        if (ei_status.mem)
-                iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init el2_probe(int unit)
 {
@@ -726,6 +718,14 @@ init_module(void)
         return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+        /* NB: el2_close() handles free_irq */
+        release_region(dev->base_addr, EL2_IO_EXTENT);
+        if (ei_status.mem)
+                iounmap(ei_status.mem);
+}
+
 void
 cleanup_module(void)
 {