summaryrefslogtreecommitdiffstats
path: root/drivers/net/3c505.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-12-13 00:13:32 +0100
committerDave Jones <davej@redhat.com>2006-12-13 00:13:32 +0100
commitf0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch)
tree2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/net/3c505.c
parent[AGPGART] VIA and SiS AGP chipsets are x86-only (diff)
parent[PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem (diff)
downloadlinux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.tar.xz
linux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.zip
Merge ../linus
Diffstat (limited to 'drivers/net/3c505.c')
-rw-r--r--drivers/net/3c505.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index ab8230a68bea..702bfb2a5e99 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -649,7 +649,7 @@ static void receive_packet(struct net_device *dev, int len)
*
******************************************************/
-static irqreturn_t elp_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr)
+static irqreturn_t elp_interrupt(int irq, void *dev_id)
{
int len;
int dlen;
@@ -1670,7 +1670,7 @@ int __init init_module(void)
return 0;
}
-void cleanup_module(void)
+void __exit cleanup_module(void)
{
int this_dev;