diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /sound/pci/echoaudio/echoaudio.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'sound/pci/echoaudio/echoaudio.c')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index c3dafa29054f..e5e88fe54de0 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c | |||
| @@ -1818,8 +1818,7 @@ static struct snd_kcontrol_new snd_echo_channels_info __devinitdata = { | |||
| 1818 | IRQ Handler | 1818 | IRQ Handler |
| 1819 | ******************************************************************************/ | 1819 | ******************************************************************************/ |
| 1820 | 1820 | ||
| 1821 | static irqreturn_t snd_echo_interrupt(int irq, void *dev_id, | 1821 | static irqreturn_t snd_echo_interrupt(int irq, void *dev_id) |
| 1822 | struct pt_regs *regs) | ||
| 1823 | { | 1822 | { |
| 1824 | struct echoaudio *chip = dev_id; | 1823 | struct echoaudio *chip = dev_id; |
| 1825 | struct snd_pcm_substream *substream; | 1824 | struct snd_pcm_substream *substream; |