Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romie...

[linux-2.6-omap-h63xx.git] / drivers / atm / eni.c

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index df359a6c14f6ab57a140c62bed4d6b274595f674..bc1b13c8f5d717893661d12ee0fad2512175c91b 100644 (file)
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1488,7 +1488,7 @@ static void bug_int(struct atm_dev *dev,unsigned long reason)
 }
 
 
-static irqreturn_t eni_int(int irq,void *dev_id,struct pt_regs *regs)
+static irqreturn_t eni_int(int irq,void *dev_id)
 {
        struct atm_dev *dev;
        struct eni_dev *eni_dev;