X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=sound%2Fpci%2Frme32.c;h=2a71499242fa6f626cb6b3bb30bffcfbe0aaf87c;hb=28a2a3f58707cba16b329b90f601c01599456491;hp=2cb9fe98db2f51f43ba2bbe1ba51c929f9d1c667;hpb=af57d238aa2107e1b45d8dacad6e50db938f0567;p=powerpc.git

diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 2cb9fe98db..2a71499242 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -227,7 +227,7 @@ struct rme32 {
 	struct snd_kcontrol *spdif_ctl;
 };
 
-static struct pci_device_id snd_rme32_ids[] __devinitdata = {
+static struct pci_device_id snd_rme32_ids[] = {
 	{PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
 	{PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8,
@@ -1374,7 +1374,7 @@ static int __devinit snd_rme32_create(struct rme32 * rme32)
 		return -ENOMEM;
 	}
 
-	if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) {
+	if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_DISABLED | IRQF_SHARED, "RME32", (void *) rme32)) {
 		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
 		return -EBUSY;
 	}