diff options
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 3281e519e714..7bf25b88ea31 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
@@ -801,9 +801,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
801 | /* Decide what type of interrupt we are registering */ | 801 | /* Decide what type of interrupt we are registering */ |
802 | type = 0; | 802 | type = 0; |
803 | if (s->functions > 1) /* All of this ought to be handled higher up */ | 803 | if (s->functions > 1) /* All of this ought to be handled higher up */ |
804 | type = SA_SHIRQ; | 804 | type = IRQF_SHARED; |
805 | if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) | 805 | if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) |
806 | type = SA_SHIRQ; | 806 | type = IRQF_SHARED; |
807 | 807 | ||
808 | #ifdef CONFIG_PCMCIA_PROBE | 808 | #ifdef CONFIG_PCMCIA_PROBE |
809 | if (s->irq.AssignedIRQ != 0) { | 809 | if (s->irq.AssignedIRQ != 0) { |
@@ -845,7 +845,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
845 | if (ret && !s->irq.AssignedIRQ) { | 845 | if (ret && !s->irq.AssignedIRQ) { |
846 | if (!s->pci_irq) | 846 | if (!s->pci_irq) |
847 | return ret; | 847 | return ret; |
848 | type = SA_SHIRQ; | 848 | type = IRQF_SHARED; |
849 | irq = s->pci_irq; | 849 | irq = s->pci_irq; |
850 | } | 850 | } |
851 | 851 | ||
@@ -855,7 +855,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
855 | } | 855 | } |
856 | 856 | ||
857 | /* Make sure the fact the request type was overridden is passed back */ | 857 | /* Make sure the fact the request type was overridden is passed back */ |
858 | if (type == SA_SHIRQ && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) { | 858 | if (type == IRQF_SHARED && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) { |
859 | req->Attributes |= IRQ_TYPE_DYNAMIC_SHARING; | 859 | req->Attributes |= IRQ_TYPE_DYNAMIC_SHARING; |
860 | printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n"); | 860 | printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n"); |
861 | printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines.\n"); | 861 | printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines.\n"); |