projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
[linux-block.git]
/
arch
/
mips
/
pci
/
ops-pmcmsp.c
diff --git
a/arch/mips/pci/ops-pmcmsp.c
b/arch/mips/pci/ops-pmcmsp.c
index 059eade96f2e74fdd3aa29da8fe30919f5a84379..109c95ca698bb9cb3aefde8b584d4f1bfa7d834d 100644
(file)
--- a/
arch/mips/pci/ops-pmcmsp.c
+++ b/
arch/mips/pci/ops-pmcmsp.c
@@
-404,7
+404,7
@@
int msp_pcibios_config_access(unsigned char access_type,
if (pciirqflag == 0) {
request_irq(MSP_INT_PCI,/* Hardcoded internal MSP7120 wiring */
bpci_interrupt,
-
SA_SHIRQ | SA_INTERRUPT
,
+
IRQF_SHARED | IRQF_DISABLED
,
"PMC MSP PCI Host",
preg);
pciirqflag = ~0;