projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
i2c
/
busses
/
i2c-ocores.c
diff --git
a/drivers/i2c/busses/i2c-ocores.c
b/drivers/i2c/busses/i2c-ocores.c
index
3e276e9
..
f28a76d
100644
(file)
--- a/
drivers/i2c/busses/i2c-ocores.c
+++ b/
drivers/i2c/busses/i2c-ocores.c
@@
-143,7
+143,7
@@
static void ocores_process(struct ocores_i2c *i2c)
}
}
-static irqreturn_t ocores_isr(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t ocores_isr(int irq, void *dev_id)
{
struct ocores_i2c *i2c = dev_id;