projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge http://www.kernel.org/pub/scm/linux/kernel/git/perex/alsa
[powerpc.git]
/
arch
/
i386
/
pci
/
irq.c
diff --git
a/arch/i386/pci/irq.c
b/arch/i386/pci/irq.c
index
bdb4896
..
4a8995c
100644
(file)
--- a/
arch/i386/pci/irq.c
+++ b/
arch/i386/pci/irq.c
@@
-864,7
+864,7
@@
static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
for (i = 0; i < 16; i++) {
if (!(mask & (1 << i)))
continue;
- if (pirq_penalty[i] < pirq_penalty[newirq] && can_request_irq(i,
SA_SHIRQ
))
+ if (pirq_penalty[i] < pirq_penalty[newirq] && can_request_irq(i,
IRQF_SHARED
))
newirq = i;
}
}