Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / char / ppdev.c

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 520d2cf82bc0ca74edbe00b834288cfdd022ec8d..efc485edad1c26ebbb1d3a43a95c9b54f881d617 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -269,7 +269,7 @@ static ssize_t pp_write (struct file * file, const char __user * buf,
        return bytes_written;
 }
 
-static void pp_irq (int irq, void * private, struct pt_regs * unused)
+static void pp_irq (int irq, void * private)
 {
        struct pp_struct * pp = (struct pp_struct *) private;