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/wbsd.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/mmc/wbsd.c')
| -rw-r--r-- | drivers/mmc/wbsd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 88c6f0b129f5..ced309b37a8f 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
| @@ -1256,7 +1256,7 @@ end: | |||
| 1256 | * Interrupt handling | 1256 | * Interrupt handling |
| 1257 | */ | 1257 | */ |
| 1258 | 1258 | ||
| 1259 | static irqreturn_t wbsd_irq(int irq, void *dev_id, struct pt_regs *regs) | 1259 | static irqreturn_t wbsd_irq(int irq, void *dev_id) |
| 1260 | { | 1260 | { |
| 1261 | struct wbsd_host *host = dev_id; | 1261 | struct wbsd_host *host = dev_id; |
| 1262 | int isr; | 1262 | int isr; |