diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/mtd/nand/cafe.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mtd/nand/cafe.c')
| -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 | ||