summaryrefslogtreecommitdiff
path: root/drivers/video/omap/dispc.h
diff options
context:
space:
mode:
authorDaniel Stone <daniel.stone@nokia.com>2009-09-22 16:46:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 07:39:50 -0700
commit4c88ef170f0f9b1f26923b43af526c973c5a74da (patch)
tree358d55e961ad7c4d20143c52e7ae511326ffd879 /drivers/video/omap/dispc.h
parent48a00e7fe9a6abeedb62c99ca7b7860754aae3d8 (diff)
omapfb: dispc: allow multiple external IRQ handlers
Previously, the only external (to dispc.c) IRQ handler was RFBI's frame done handler. dispc's IRQ framework was very dumb: you could only have one handler, and the semantics of {request,free}_irq were odd, to say the least. The new framework allows multiple consumers to register arbitrary IRQ masks. Signed-off-by: Daniel Stone <daniel.stone@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Imre Deak <imre.deak@nokia.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/omap/dispc.h')
-rw-r--r--drivers/video/omap/dispc.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/omap/dispc.h b/drivers/video/omap/dispc.h
index ef720a78f6d5..c15ea77f0604 100644
--- a/drivers/video/omap/dispc.h
+++ b/drivers/video/omap/dispc.h
@@ -37,9 +37,10 @@ extern void omap_dispc_set_lcd_size(int width, int height);
extern void omap_dispc_enable_lcd_out(int enable);
extern void omap_dispc_enable_digit_out(int enable);
-extern int omap_dispc_request_irq(void (*callback)(void *data), void *data);
-extern void omap_dispc_free_irq(void);
+extern int omap_dispc_request_irq(unsigned long irq_mask,
+ void (*callback)(void *data), void *data);
+extern void omap_dispc_free_irq(unsigned long irq_mask,
+ void (*callback)(void *data), void *data);
extern const struct lcd_ctrl omap2_int_ctrl;
-
#endif