summaryrefslogtreecommitdiffstats
path: root/drivers/net/es3210.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-27 23:18:29 +0100
committerLen Brown <len.brown@intel.com>2006-01-27 23:18:29 +0100
commit292dd876ee765c478b27c93cc51e93a558ed58bf (patch)
tree5b740e93253295baee2a9c414a6c66d03d44a9ef /drivers/net/es3210.c
parent[ACPI] remove "Resource isn't an IRQ" warning (diff)
parent[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi bran... (diff)
downloadlinux-292dd876ee765c478b27c93cc51e93a558ed58bf.tar.xz
linux-292dd876ee765c478b27c93cc51e93a558ed58bf.zip
Pull release into acpica branch
Diffstat (limited to 'drivers/net/es3210.c')
-rw-r--r--drivers/net/es3210.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 50f8e23bb9e5..6b0ab1eac3fb 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -155,13 +155,6 @@ static int __init do_es_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, ES_IO_EXTENT);
- iounmap(ei_status.mem);
-}
-
#ifndef MODULE
struct net_device * __init es_probe(int unit)
{
@@ -456,6 +449,13 @@ init_module(void)
return -ENXIO;
}
+static void cleanup_card(struct net_device *dev)
+{
+ free_irq(dev->irq, dev);
+ release_region(dev->base_addr, ES_IO_EXTENT);
+ iounmap(ei_status.mem);
+}
+
void
cleanup_module(void)
{