X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=sound%2Fpci%2Frme96.c;h=f8de7c9970179d52bfb22b64753e0904efb73179;hb=f5a5ffad072ec3c1fd636174c30f0ba52fe0259f;hp=991cb18c14f3d14ce19ced4d319bdf89b38c96e1;hpb=37224470c8c6d90a4062e76a08d4dc1fcf91fc89;p=sfrench%2Fcifs-2.6.git

diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 991cb18c14f3..f8de7c997017 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -232,7 +232,7 @@ struct rme96 {
 	struct snd_kcontrol   *spdif_ctl;
 };
 
-static struct pci_device_id snd_rme96_ids[] __devinitdata = {
+static struct pci_device_id snd_rme96_ids[] = {
 	{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96,
 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
 	{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8,
@@ -1588,7 +1588,7 @@ snd_rme96_create(struct rme96 *rme96)
 		return -ENOMEM;
 	}
 
-	if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) {
+	if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_DISABLED|IRQF_SHARED, "RME96", (void *)rme96)) {
 		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
 		return -EBUSY;
 	}