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

[linux-2.6-omap-h63xx.git] / drivers / net / lne390.c

diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c
index 309d254842cf2f85ab2d0ea7653b98d4132b7248..5795ee1162054a5701076f1d2092528de95ff119 100644 (file)
--- a/drivers/net/lne390.c
+++ b/drivers/net/lne390.c
@@ -145,13 +145,6 @@ static int __init do_lne390_probe(struct net_device *dev)
        return -ENODEV;
 }
 
-static void cleanup_card(struct net_device *dev)
-{
-       free_irq(dev->irq, dev);
-       release_region(dev->base_addr, LNE390_IO_EXTENT);
-       iounmap(ei_status.mem);
-}
-
 #ifndef MODULE
 struct net_device * __init lne390_probe(int unit)
 {
@@ -195,7 +188,7 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
        }
 
        revision = (eisa_id >> 24) & 0x01;      /* 0 = rev A, 1 rev B */
-       
+
 #if 0
 /*     Check the Mylex vendor ID as well. Not really required. */
        if (inb(ioaddr + LNE390_SA_PROM + 0) != LNE390_ADDR0
@@ -348,7 +341,7 @@ lne390_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_
        hdr->count = (hdr->count + 3) & ~3;     /* Round up allocation. */
 }
 
-/*     
+/*
  *     Block input and output are easy on shared memory ethercards, the only
  *     complication is when the ring buffer wraps. The count will already
  *     be rounded up to a doubleword value via lne390_get_8390_hdr() above.
@@ -413,7 +406,7 @@ MODULE_PARM_DESC(mem, "memory base address(es)");
 MODULE_DESCRIPTION("Mylex LNE390A/B EISA Ethernet driver");
 MODULE_LICENSE("GPL");
 
-int init_module(void)
+int __init init_module(void)
 {
        struct net_device *dev;
        int this_dev, found = 0;
@@ -440,6 +433,13 @@ int init_module(void)
        return -ENXIO;
 }
 
+static void cleanup_card(struct net_device *dev)
+{
+       free_irq(dev->irq, dev);
+       release_region(dev->base_addr, LNE390_IO_EXTENT);
+       iounmap(ei_status.mem);
+}
+
 void cleanup_module(void)
 {
        int this_dev;