---

yaml
---
r: 31631
b: refs/heads/master
c: 272ee69
h: refs/heads/master
i:
  31629: 67479db
  31627: a6d114a
  31623: 142127e
  31615: 180fc82
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 362537b9abf02458967fc2bd9aa7cd18e3ef576a
+refs/heads/master: 272ee69c653d4b4f15049ed956554085d4bdaa44

trunk/drivers/ieee1394/ohci1394.c

@@ -3392,12 +3392,12 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
 	spin_lock_init(&ohci->event_lock);
 
 	/*
-	 * interrupts are disabled, all right, but... due to SA_SHIRQ we
+	 * interrupts are disabled, all right, but... due to IRQF_SHARED we
 	 * might get called anyway.  We'll see no event, of course, but
 	 * we need to get to that "no event", so enough should be initialized
 	 * by that point.
 	 */
-	if (request_irq(dev->irq, ohci_irq_handler, SA_SHIRQ,
+	if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,
 			 OHCI1394_DRIVER_NAME, ohci))
 		FAIL(-ENOMEM, "Failed to allocate shared interrupt %d", dev->irq);
 

trunk/drivers/ieee1394/pcilynx.c

@@ -1253,7 +1253,7 @@ static int __devinit add_card(struct pci_dev *dev,
 
 	sprintf (irq_buf, "%d", dev->irq);
 
-        if (!request_irq(dev->irq, lynx_irq_handler, SA_SHIRQ,
+        if (!request_irq(dev->irq, lynx_irq_handler, IRQF_SHARED,
                          PCILYNX_DRIVER_NAME, lynx)) {
                 PRINT(KERN_INFO, lynx->id, "allocated interrupt %s", irq_buf);
                 lynx->state = have_intr;