diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/mmc/imxmmc.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/mmc/imxmmc.c')
| -rw-r--r-- | drivers/mmc/imxmmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c index 1b79dd271aae..659d4a822cc5 100644 --- a/drivers/mmc/imxmmc.c +++ b/drivers/mmc/imxmmc.c | |||
| @@ -635,7 +635,7 @@ static int imxmci_cpu_driven_data(struct imxmci_host *host, unsigned int *pstat) | |||
| 635 | return trans_done; | 635 | return trans_done; |
| 636 | } | 636 | } |
| 637 | 637 | ||
| 638 | static void imxmci_dma_irq(int dma, void *devid, struct pt_regs *regs) | 638 | static void imxmci_dma_irq(int dma, void *devid) |
| 639 | { | 639 | { |
| 640 | struct imxmci_host *host = devid; | 640 | struct imxmci_host *host = devid; |
| 641 | uint32_t stat = MMC_STATUS; | 641 | uint32_t stat = MMC_STATUS; |
| @@ -646,7 +646,7 @@ static void imxmci_dma_irq(int dma, void *devid, struct pt_regs *regs) | |||
| 646 | tasklet_schedule(&host->tasklet); | 646 | tasklet_schedule(&host->tasklet); |
| 647 | } | 647 | } |
| 648 | 648 | ||
| 649 | static irqreturn_t imxmci_irq(int irq, void *devid, struct pt_regs *regs) | 649 | static irqreturn_t imxmci_irq(int irq, void *devid) |
| 650 | { | 650 | { |
| 651 | struct imxmci_host *host = devid; | 651 | struct imxmci_host *host = devid; |
| 652 | uint32_t stat = MMC_STATUS; | 652 | uint32_t stat = MMC_STATUS; |