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 /include/asm-arm/arch-pxa/mmc.h | |
| parent | 5a43c09d1b65da614620b1985633e3251b4f9b99 (diff) | |
| parent | 40220c1a192f51695f806d75b1f9970f0f17a6e8 (diff) | |
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-arm/arch-pxa/mmc.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/mmc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/mmc.h b/include/asm-arm/arch-pxa/mmc.h index b704c4f05f4..a38a28c4bbd 100644 --- a/include/asm-arm/arch-pxa/mmc.h +++ b/include/asm-arm/arch-pxa/mmc.h @@ -10,7 +10,7 @@ struct mmc_host; struct pxamci_platform_data { unsigned int ocr_mask; /* available voltages */ unsigned long detect_delay; /* delay in jiffies before detecting cards after interrupt */ - int (*init)(struct device *, irqreturn_t (*)(int, void *), void *); + int (*init)(struct device *, irq_handler_t , void *); int (*get_ro)(struct device *); void (*setpower)(struct device *, unsigned int); void (*exit)(struct device *, void *); |