Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[~andy/linux] / drivers / macintosh / macio-adb.c

diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 57ccc19cbdbf9f6dccb4c7c02347b1afbaac3188..797cef72258f317a06340a08107e0f357326d73c 100644 (file)
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -270,6 +270,6 @@ static void macio_adb_poll(void)
 
        local_irq_save(flags);
        if (in_8(&adb->intr.r) != 0)
-               macio_adb_interrupt(0, NULL, NULL);
+               macio_adb_interrupt(0, NULL);
        local_irq_restore(flags);
 }