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
/
isdn
/
hardware
/
eicon
/
diva.c
diff --git
a/drivers/isdn/hardware/eicon/diva.c
b/drivers/isdn/hardware/eicon/diva.c
index
8ab8027
..
ffa2afa
100644
(file)
--- a/
drivers/isdn/hardware/eicon/diva.c
+++ b/
drivers/isdn/hardware/eicon/diva.c
@@
-71,8
+71,6
@@
DivaIdiReqFunc(29)
DivaIdiReqFunc(30)
DivaIdiReqFunc(31)
DivaIdiReqFunc(30)
DivaIdiReqFunc(31)
-struct pt_regs;
-
/*
** LOCALS
*/
/*
** LOCALS
*/
@@
-515,7
+513,7
@@
diva_xdi_read(void *adapter, void *os_handle, void __user *dst,
}
}
-irqreturn_t diva_os_irq_wrapper(int irq, void *context
, struct pt_regs *regs
)
+irqreturn_t diva_os_irq_wrapper(int irq, void *context)
{
diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) context;
diva_xdi_clear_interrupts_proc_t clear_int_proc;
{
diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) context;
diva_xdi_clear_interrupts_proc_t clear_int_proc;