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.h
diff --git
a/sound/pci/pcxhr/pcxhr_core.h
b/sound/pci/pcxhr/pcxhr_core.h
index
e7415d6
..
d9a4ab6
100644
(file)
--- a/
sound/pci/pcxhr/pcxhr_core.h
+++ b/
sound/pci/pcxhr/pcxhr_core.h
@@
-194,7
+194,7
@@
int pcxhr_write_io_num_reg_cont(struct pcxhr_mgr *mgr, unsigned int mask,
/* interrupt handling */
/* interrupt handling */
-irqreturn_t pcxhr_interrupt(int irq, void *dev_id
, struct pt_regs *regs
);
+irqreturn_t pcxhr_interrupt(int irq, void *dev_id);
void pcxhr_msg_tasklet(unsigned long arg);
#endif /* __SOUND_PCXHR_CORE_H */
void pcxhr_msg_tasklet(unsigned long arg);
#endif /* __SOUND_PCXHR_CORE_H */