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-pca-isa.c
diff --git
a/drivers/i2c/busses/i2c-pca-isa.c
b/drivers/i2c/busses/i2c-pca-isa.c
index
d9b4ddb
..
cc6536a
100644
(file)
--- a/
drivers/i2c/busses/i2c-pca-isa.c
+++ b/
drivers/i2c/busses/i2c-pca-isa.c
@@
-99,7
+99,7
@@
static int pca_isa_waitforinterrupt(struct i2c_algo_pca_data *adap)
return ret;
}
return ret;
}
-static irqreturn_t pca_handler(int this_irq, void *dev_id
, struct pt_regs *regs
) {
+static irqreturn_t pca_handler(int this_irq, void *dev_id) {
wake_up_interruptible(&pca_wait);
return IRQ_HANDLED;
}
wake_up_interruptible(&pca_wait);
return IRQ_HANDLED;
}
@@
-156,7
+156,7
@@
static int __init pca_isa_init(void)
static void pca_isa_exit(void)
{
static void pca_isa_exit(void)
{
- i2c_
pca_del_bus
(&pca_isa_ops);
+ i2c_
del_adapter
(&pca_isa_ops);
if (irq > 0) {
disable_irq(irq);
if (irq > 0) {
disable_irq(irq);