git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull fluff into release branch
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
low_i2c.c
diff --git
a/arch/powerpc/platforms/powermac/low_i2c.c
b/arch/powerpc/platforms/powermac/low_i2c.c
index c2c7cf75dd5fa3a339b0b41351c96c25edc12b11..bfc4829162f1f2aba47aeca9b93df92ae3df01d0 100644
(file)
--- a/
arch/powerpc/platforms/powermac/low_i2c.c
+++ b/
arch/powerpc/platforms/powermac/low_i2c.c
@@
-342,7
+342,7
@@
static void kw_i2c_handle_interrupt(struct pmac_i2c_host_kw *host, u8 isr)
}
/* Interrupt handler */
-static irqreturn_t kw_i2c_irq(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t kw_i2c_irq(int irq, void *dev_id)
{
struct pmac_i2c_host_kw *host = dev_id;
unsigned long flags;