diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 13:13:19 -0400 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /drivers/mmc/au1xmmc.c | |
| parent | b0df3bd1e553e901ec7297267611a5db88240b38 (diff) | |
| parent | e8216dee838c09776680a6f1a2e54d81f3cdfa14 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mmc/au1xmmc.c')
| -rw-r--r-- | drivers/mmc/au1xmmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c index fb606165af3b..61268da13957 100644 --- a/drivers/mmc/au1xmmc.c +++ b/drivers/mmc/au1xmmc.c | |||
| @@ -731,7 +731,7 @@ static void au1xmmc_set_ios(struct mmc_host* mmc, struct mmc_ios* ios) | |||
| 731 | } | 731 | } |
| 732 | } | 732 | } |
| 733 | 733 | ||
| 734 | static void au1xmmc_dma_callback(int irq, void *dev_id, struct pt_regs *regs) | 734 | static void au1xmmc_dma_callback(int irq, void *dev_id) |
| 735 | { | 735 | { |
| 736 | struct au1xmmc_host *host = (struct au1xmmc_host *) dev_id; | 736 | struct au1xmmc_host *host = (struct au1xmmc_host *) dev_id; |
| 737 | 737 | ||