Merge branch 'from-linus' into upstream

[linux-2.6] / drivers / block / umem.c

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index f675f97f2a7864469bf715d7cf140f1f0034969e..5d8925bd90454c68d33d00d3263e93dac09b91df 100644 (file)
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1040,7 +1040,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, const struct pci_device_i
        card->win_size = data;
 
 
-       if (request_irq(dev->irq, mm_interrupt, SA_SHIRQ, "pci-umem", card)) {
+       if (request_irq(dev->irq, mm_interrupt, IRQF_SHARED, "pci-umem", card)) {
                printk(KERN_ERR "MM%d: Unable to allocate IRQ\n", card->card_number);
                ret = -ENODEV;