diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /drivers/pcmcia | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index afea2b2558b5..76d4a98f0955 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
| @@ -693,8 +693,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
| 693 | type = 0; | 693 | type = 0; |
| 694 | if (s->functions > 1) /* All of this ought to be handled higher up */ | 694 | if (s->functions > 1) /* All of this ought to be handled higher up */ |
| 695 | type = IRQF_SHARED; | 695 | type = IRQF_SHARED; |
| 696 | if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) | 696 | else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) |
| 697 | type = IRQF_SHARED; | 697 | type = IRQF_SHARED; |
| 698 | else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n"); | ||
| 698 | 699 | ||
| 699 | #ifdef CONFIG_PCMCIA_PROBE | 700 | #ifdef CONFIG_PCMCIA_PROBE |
| 700 | 701 | ||