Signed-off-by: Thomas Gleixner drivers/ieee1394/ohci1394.c | 4 ++-- drivers/ieee1394/pcilynx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6.git/drivers/ieee1394/ohci1394.c =================================================================== --- linux-2.6.git.orig/drivers/ieee1394/ohci1394.c 2006-07-01 16:51:18.000000000 +0200 +++ linux-2.6.git/drivers/ieee1394/ohci1394.c 2006-07-01 16:51:41.000000000 +0200 @@ -3392,12 +3392,12 @@ static int __devinit ohci1394_pci_probe( 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); Index: linux-2.6.git/drivers/ieee1394/pcilynx.c =================================================================== --- linux-2.6.git.orig/drivers/ieee1394/pcilynx.c 2006-07-01 16:51:18.000000000 +0200 +++ linux-2.6.git/drivers/ieee1394/pcilynx.c 2006-07-01 16:51:41.000000000 +0200 @@ -1253,7 +1253,7 @@ static int __devinit add_card(struct pci 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; --