X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=sound%2Fpci%2Fens1370.c;h=a8a601fc781f9ca44b10a036ae9a3d48bb550487;hb=f5a5ffad072ec3c1fd636174c30f0ba52fe0259f;hp=9d46bbee2a406ac14b6eeb4fe52697465888431f;hpb=8cf60e04a131310199d5776e2f9e915f0c468899;p=sfrench%2Fcifs-2.6.git

diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 9d46bbee2a40..a8a601fc781f 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -446,7 +446,7 @@ struct ensoniq {
 
 static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 
-static struct pci_device_id snd_audiopci_ids[] __devinitdata = {
+static struct pci_device_id snd_audiopci_ids[] = {
 #ifdef CHIP1370
 	{ 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },	/* ES1370 */
 #endif
@@ -2135,7 +2135,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,
 		return err;
 	}
 	ensoniq->port = pci_resource_start(pci, 0);
-	if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ,
+	if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_DISABLED|IRQF_SHARED,
 			"Ensoniq AudioPCI", ensoniq)) {
 		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
 		snd_ensoniq_free(ensoniq);