Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / parport / daisy.c

diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 83ee095..ff9f344 100644 (file)
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -216,7 +216,7 @@ void parport_daisy_fini(struct parport *port)
 
 struct pardevice *parport_open(int devnum, const char *name,
                                int (*pf) (void *), void (*kf) (void *),
-                               void (*irqf) (int, void *, struct pt_regs *),
+                               void (*irqf) (int, void *),
                                int flags, void *handle)
 {
        struct daisydev *p = topology;