Merge branch 'uhid' into for-linus

[~andy/linux] / arch / arm / mach-omap1 / ams-delta-fiq.c

diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
index cfd98b186fcc2955765caa2a53267bf68d806443..68e8e5654c0a944a13deb8d13b37c58a1d0c1b8b 100644 (file)
--- a/arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/arch/arm/mach-omap1/ams-delta-fiq.c
@@ -102,7 +102,7 @@ void __init ams_delta_init_fiq(void)
        }
 
        retval = request_irq(INT_DEFERRED_FIQ, deferred_fiq,
-                       IRQ_TYPE_EDGE_RISING, "deferred_fiq", 0);
+                       IRQ_TYPE_EDGE_RISING, "deferred_fiq", NULL);
        if (retval < 0) {
                pr_err("Failed to get deferred_fiq IRQ, ret=%d\n", retval);
                release_fiq(&fh);