diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/spi/spi_mpc83xx.c | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/spi/spi_mpc83xx.c')
| -rw-r--r-- | drivers/spi/spi_mpc83xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index 5d92a7e5cb41..ff0b04895db0 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
| @@ -296,8 +296,7 @@ static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t) | |||
| 296 | return t->len - mpc83xx_spi->count; | 296 | return t->len - mpc83xx_spi->count; |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data, | 299 | irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data) |
| 300 | struct pt_regs * ptregs) | ||
| 301 | { | 300 | { |
| 302 | struct mpc83xx_spi *mpc83xx_spi = context_data; | 301 | struct mpc83xx_spi *mpc83xx_spi = context_data; |
| 303 | u32 event; | 302 | u32 event; |