mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
This commit is contained in:
commit
0803d540db
399 changed files with 2796 additions and 3307 deletions
|
|
@ -693,8 +693,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
|
|||
type = 0;
|
||||
if (s->functions > 1) /* All of this ought to be handled higher up */
|
||||
type = IRQF_SHARED;
|
||||
if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
|
||||
else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
|
||||
type = IRQF_SHARED;
|
||||
else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
|
||||
|
||||
#ifdef CONFIG_PCMCIA_PROBE
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue