diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/mmc/omap.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/mmc/omap.c')
| -rw-r--r-- | drivers/mmc/omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index 52c9e52e6b78..762fa2895891 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c | |||
| @@ -377,7 +377,7 @@ static inline void mmc_omap_report_irq(u16 status) | |||
| 377 | } | 377 | } |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | static irqreturn_t mmc_omap_irq(int irq, void *dev_id, struct pt_regs *regs) | 380 | static irqreturn_t mmc_omap_irq(int irq, void *dev_id) |
| 381 | { | 381 | { |
| 382 | struct mmc_omap_host * host = (struct mmc_omap_host *)dev_id; | 382 | struct mmc_omap_host * host = (struct mmc_omap_host *)dev_id; |
| 383 | u16 status; | 383 | u16 status; |
| @@ -514,7 +514,7 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id, struct pt_regs *regs) | |||
| 514 | return IRQ_HANDLED; | 514 | return IRQ_HANDLED; |
| 515 | } | 515 | } |
| 516 | 516 | ||
| 517 | static irqreturn_t mmc_omap_switch_irq(int irq, void *dev_id, struct pt_regs *regs) | 517 | static irqreturn_t mmc_omap_switch_irq(int irq, void *dev_id) |
| 518 | { | 518 | { |
| 519 | struct mmc_omap_host *host = (struct mmc_omap_host *) dev_id; | 519 | struct mmc_omap_host *host = (struct mmc_omap_host *) dev_id; |
| 520 | 520 | ||