diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-02-14 03:33:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 11:09:55 -0500 |
commit | 2db6346f76ac5bd5b632373240e3e54828111837 (patch) | |
tree | 60cc90d997cbbd3dc2d246f7a099f7e476b7fe49 /drivers/mtd/nand | |
parent | 38515e908ba3a9c467ad3bf347b9bce69216df94 (diff) |
[PATCH] Scheduled removal of SA_xxx interrupt flags fixups 2
The obsolete SA_xxx interrupt flags have been used despite the scheduled
removal. Fixup the remaining users in -mm.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/cafe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe.c index 65f9bd3ceebf..08cb060dfa3d 100644 --- a/drivers/mtd/nand/cafe.c +++ b/drivers/mtd/nand/cafe.c | |||
@@ -597,7 +597,8 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev, | |||
597 | cafe_writel(cafe, 0xffffffff, NAND_TIMING3); | 597 | cafe_writel(cafe, 0xffffffff, NAND_TIMING3); |
598 | } | 598 | } |
599 | cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK); | 599 | cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK); |
600 | err = request_irq(pdev->irq, &cafe_nand_interrupt, SA_SHIRQ, "CAFE NAND", mtd); | 600 | err = request_irq(pdev->irq, &cafe_nand_interrupt, IRQF_SHARED, |
601 | "CAFE NAND", mtd); | ||
601 | if (err) { | 602 | if (err) { |
602 | dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq); | 603 | dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq); |
603 | 604 | ||