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/oss/ali5455.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'sound/oss/ali5455.c')
| -rw-r--r-- | sound/oss/ali5455.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/ali5455.c b/sound/oss/ali5455.c index 62bb936b1f3d..70dcd703a66f 100644 --- a/sound/oss/ali5455.c +++ b/sound/oss/ali5455.c | |||
| @@ -3460,7 +3460,7 @@ static int __devinit ali_probe(struct pci_dev *pci_dev, | |||
| 3460 | card->channel[4].num = 4; | 3460 | card->channel[4].num = 4; |
| 3461 | /* claim our iospace and irq */ | 3461 | /* claim our iospace and irq */ |
| 3462 | request_region(card->iobase, 256, card_names[pci_id->driver_data]); | 3462 | request_region(card->iobase, 256, card_names[pci_id->driver_data]); |
| 3463 | if (request_irq(card->irq, &ali_interrupt, SA_SHIRQ, | 3463 | if (request_irq(card->irq, &ali_interrupt, IRQF_SHARED, |
| 3464 | card_names[pci_id->driver_data], card)) { | 3464 | card_names[pci_id->driver_data], card)) { |
| 3465 | printk(KERN_ERR "ali_audio: unable to allocate irq %d\n", | 3465 | printk(KERN_ERR "ali_audio: unable to allocate irq %d\n", |
| 3466 | card->irq); | 3466 | card->irq); |