diff options
Diffstat (limited to 'drivers/sn/ioc3.c')
-rw-r--r-- | drivers/sn/ioc3.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c index ed946311d3a4..6c7e0352d561 100644 --- a/drivers/sn/ioc3.c +++ b/drivers/sn/ioc3.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * Pat Gefre <pfg@sgi.com> - IOC3 serial port IRQ demuxer | 7 | * Pat Gefre <pfg@sgi.com> - IOC3 serial port IRQ demuxer |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
@@ -707,7 +706,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
707 | writel(~0, &idd->vma->eisr); | 706 | writel(~0, &idd->vma->eisr); |
708 | 707 | ||
709 | idd->dual_irq = 1; | 708 | idd->dual_irq = 1; |
710 | if (!request_irq(pdev->irq, ioc3_intr_eth, SA_SHIRQ, | 709 | if (!request_irq(pdev->irq, ioc3_intr_eth, IRQF_SHARED, |
711 | "ioc3-eth", (void *)idd)) { | 710 | "ioc3-eth", (void *)idd)) { |
712 | idd->irq_eth = pdev->irq; | 711 | idd->irq_eth = pdev->irq; |
713 | } else { | 712 | } else { |
@@ -715,7 +714,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
715 | "%s : request_irq fails for IRQ 0x%x\n ", | 714 | "%s : request_irq fails for IRQ 0x%x\n ", |
716 | __FUNCTION__, pdev->irq); | 715 | __FUNCTION__, pdev->irq); |
717 | } | 716 | } |
718 | if (!request_irq(pdev->irq+2, ioc3_intr_io, SA_SHIRQ, | 717 | if (!request_irq(pdev->irq+2, ioc3_intr_io, IRQF_SHARED, |
719 | "ioc3-io", (void *)idd)) { | 718 | "ioc3-io", (void *)idd)) { |
720 | idd->irq_io = pdev->irq+2; | 719 | idd->irq_io = pdev->irq+2; |
721 | } else { | 720 | } else { |
@@ -724,7 +723,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
724 | __FUNCTION__, pdev->irq+2); | 723 | __FUNCTION__, pdev->irq+2); |
725 | } | 724 | } |
726 | } else { | 725 | } else { |
727 | if (!request_irq(pdev->irq, ioc3_intr_io, SA_SHIRQ, | 726 | if (!request_irq(pdev->irq, ioc3_intr_io, IRQF_SHARED, |
728 | "ioc3", (void *)idd)) { | 727 | "ioc3", (void *)idd)) { |
729 | idd->irq_io = pdev->irq; | 728 | idd->irq_io = pdev->irq; |
730 | } else { | 729 | } else { |