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]
/
sound
/
pci
/
pcxhr
/
pcxhr_core.c
diff --git
a/sound/pci/pcxhr/pcxhr_core.c
b/sound/pci/pcxhr/pcxhr_core.c
index
c40f590
..
0ff8dc3
100644
(file)
--- a/
sound/pci/pcxhr/pcxhr_core.c
+++ b/
sound/pci/pcxhr/pcxhr_core.c
@@
-1131,7
+1131,7
@@
static void pcxhr_update_timer_pos(struct pcxhr_mgr *mgr,
}
-irqreturn_t pcxhr_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+irqreturn_t pcxhr_interrupt(int irq, void *dev_id)
{
struct pcxhr_mgr *mgr = dev_id;
unsigned int reg;