summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/poodle.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 21:29:26 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 21:29:26 (GMT)
commit9b6d99f48dfc27d6009e134a5d771eaefd75faac (patch)
tree5131841a5df84ad9564dad19f11f9d1a0e0085bb /arch/arm/mach-pxa/poodle.c
parent5a43c09d1b65da614620b1985633e3251b4f9b99 (diff)
parent40220c1a192f51695f806d75b1f9970f0f17a6e8 (diff)
downloadlinux-fsl-qoriq-9b6d99f48dfc27d6009e134a5d771eaefd75faac.tar.xz
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/arm/mach-pxa/poodle.c')
-rw-r--r--arch/arm/mach-pxa/poodle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 9052a97..34fb80b 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -197,7 +197,7 @@ static struct platform_device poodle_ts_device = {
*/
static struct pxamci_platform_data poodle_mci_platform_data;
-static int poodle_mci_init(struct device *dev, irqreturn_t (*poodle_detect_int)(int, void *), void *data)
+static int poodle_mci_init(struct device *dev, irq_handler_t poodle_detect_int, void *data)
{
int err;