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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
sbus
/
char
/
uctrl.c
diff --git
a/drivers/sbus/char/uctrl.c
b/drivers/sbus/char/uctrl.c
index
e2d9a7c
..
b30372f
100644
(file)
--- a/
drivers/sbus/char/uctrl.c
+++ b/
drivers/sbus/char/uctrl.c
@@
-217,7
+217,7
@@
uctrl_open(struct inode *inode, struct file *file)
return 0;
}
return 0;
}
-static irqreturn_t uctrl_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t uctrl_interrupt(int irq, void *dev_id)
{
struct uctrl_driver *driver = (struct uctrl_driver *)dev_id;
printk("in uctrl_interrupt\n");
{
struct uctrl_driver *driver = (struct uctrl_driver *)dev_id;
printk("in uctrl_interrupt\n");
@@
-400,7
+400,7
@@
static int __init ts102_uctrl_init(void)
}
driver->regs->uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK;
}
driver->regs->uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK;
- printk("uctrl: 0x%
x (irq %s)\n", driver->regs, __irq_itoa(driver->irq)
);
+ printk("uctrl: 0x%
p (irq %d)\n", driver->regs, driver->irq
);
uctrl_get_event_status();
uctrl_get_external_status();
return 0;
uctrl_get_event_status();
uctrl_get_external_status();
return 0;