diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 14:29:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 14:29:26 -0700 |
commit | 9b6d99f48dfc27d6009e134a5d771eaefd75faac (patch) | |
tree | 5131841a5df84ad9564dad19f11f9d1a0e0085bb /arch/powerpc | |
parent | 5a43c09d1b65da614620b1985633e3251b4f9b99 (diff) | |
parent | 40220c1a192f51695f806d75b1f9970f0f17a6e8 (diff) | |
download | talos-obmc-linux-9b6d99f48dfc27d6009e134a5d771eaefd75faac.tar.gz talos-obmc-linux-9b6d99f48dfc27d6009e134a5d771eaefd75faac.zip |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Use the new typedef for interrupt handler function pointers
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/ibmebus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c index da9fe254eb94..39db7a3affe1 100644 --- a/arch/powerpc/kernel/ibmebus.c +++ b/arch/powerpc/kernel/ibmebus.c @@ -319,7 +319,7 @@ EXPORT_SYMBOL(ibmebus_unregister_driver); int ibmebus_request_irq(struct ibmebus_dev *dev, u32 ist, - irqreturn_t (*handler)(int, void*), + irq_handler_t handler, unsigned long irq_flags, const char * devname, void *dev_id) { |