diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /sound/sparc/amd7930.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'sound/sparc/amd7930.c')
| -rw-r--r-- | sound/sparc/amd7930.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index ba1b2a3443d3..db3e22efd02e 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c | |||
| @@ -973,7 +973,7 @@ static int __init snd_amd7930_create(struct snd_card *card, | |||
| 973 | amd7930_idle(amd); | 973 | amd7930_idle(amd); |
| 974 | 974 | ||
| 975 | if (request_irq(irq, snd_amd7930_interrupt, | 975 | if (request_irq(irq, snd_amd7930_interrupt, |
| 976 | SA_INTERRUPT | SA_SHIRQ, "amd7930", amd)) { | 976 | IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) { |
| 977 | snd_printk("amd7930-%d: Unable to grab IRQ %d\n", | 977 | snd_printk("amd7930-%d: Unable to grab IRQ %d\n", |
| 978 | dev, irq); | 978 | dev, irq); |
| 979 | snd_amd7930_free(amd); | 979 | snd_amd7930_free(amd); |