git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-rpx.c
diff --git
a/drivers/i2c/busses/i2c-rpx.c
b/drivers/i2c/busses/i2c-rpx.c
index
0ebec3c
..
8764df0
100644
(file)
--- a/
drivers/i2c/busses/i2c-rpx.c
+++ b/
drivers/i2c/busses/i2c-rpx.c
@@
-55,10
+55,10
@@
rpx_iic_init(struct i2c_algo_8xx_data *data)
data->i2c = (i2c8xx_t *)&(((immap_t *)IMAP_ADDR)->im_i2c);
}
data->i2c = (i2c8xx_t *)&(((immap_t *)IMAP_ADDR)->im_i2c);
}
-static int rpx_install_isr(int irq, void (*func)(void *
, void *
), void *data)
+static int rpx_install_isr(int irq, void (*func)(void *), void *data)
{
/* install interrupt handler */
{
/* install interrupt handler */
- cpm_install_handler(irq,
(void (*)(void *, struct pt_regs *))
func, data);
+ cpm_install_handler(irq, func, data);
return 0;
}
return 0;
}