summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/ibmebus.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 14:29:26 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 14:29:26 -0700
commit9b6d99f48dfc27d6009e134a5d771eaefd75faac (patch)
tree5131841a5df84ad9564dad19f11f9d1a0e0085bb /include/asm-powerpc/ibmebus.h
parent5a43c09d1b65da614620b1985633e3251b4f9b99 (diff)
parent40220c1a192f51695f806d75b1f9970f0f17a6e8 (diff)
downloadblackbird-op-linux-9b6d99f48dfc27d6009e134a5d771eaefd75faac.tar.gz
blackbird-op-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 'include/asm-powerpc/ibmebus.h')
-rw-r--r--include/asm-powerpc/ibmebus.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/ibmebus.h b/include/asm-powerpc/ibmebus.h
index 9d25f2063b03..3493429b70f5 100644
--- a/include/asm-powerpc/ibmebus.h
+++ b/include/asm-powerpc/ibmebus.h
@@ -65,7 +65,7 @@ void ibmebus_unregister_driver(struct ibmebus_driver *drv);
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);
void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id);
OpenPOWER on IntegriCloud