Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[linux-2.6] / drivers / net / atari_bionet.c

diff --git a/drivers/net/atari_bionet.c b/drivers/net/atari_bionet.c
index 92b52138acadff67266436e43f5f05e7ca5cae0b..4e3bf6a1f22c8439d93d0dd53867404845c4a05a 100644 (file)
--- a/drivers/net/atari_bionet.c
+++ b/drivers/net/atari_bionet.c
@@ -220,7 +220,7 @@ gsend:
 }
 
 static irqreturn_t
-bionet_intr(int irq, void *data, struct pt_regs *fp) {
+bionet_intr(int irq, void *data) {
        return IRQ_HANDLED;
 }