projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
spi
/
spi_mpc83xx.c
diff --git
a/drivers/spi/spi_mpc83xx.c
b/drivers/spi/spi_mpc83xx.c
index
5d92a7e
..
ff0b048
100644
(file)
--- 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)
return t->len - mpc83xx_spi->count;
}
-irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data,
- struct pt_regs * ptregs)
+irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)
{
struct mpc83xx_spi *mpc83xx_spi = context_data;
u32 event;