Merge branch 'merge'

[linux-2.6-omap-h63xx.git] / sound / pci / als300.c

diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 901b08ae91745f6f820f9b7cde3a4adc29e2a8ba..96cfb8ae5055441020e6a81cf4ce5336d4131e1b 100644 (file)
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -146,7 +146,7 @@ struct snd_als300_substream_data {
        int block_counter_register;
 };
 
-static struct pci_device_id snd_als300_ids[] __devinitdata = {
+static struct pci_device_id snd_als300_ids[] = {
        { 0x4005, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300 },
        { 0x4005, 0x0308, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300_PLUS },
        { 0, }
@@ -724,7 +724,7 @@ static int __devinit snd_als300_create(snd_card_t *card,
        else
                irq_handler = snd_als300_interrupt;
 
-       if (request_irq(pci->irq, irq_handler, SA_INTERRUPT|SA_SHIRQ,
+       if (request_irq(pci->irq, irq_handler, IRQF_DISABLED|IRQF_SHARED,
                                        card->shortname, (void *)chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_als300_free(chip);