diff options
author | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
tree | 04c065ace8c62953441bc22079b93449b996f283 /arch/mips/mips-boards/malta/malta_int.c | |
parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) |
Merge branch 'merge'
Diffstat (limited to 'arch/mips/mips-boards/malta/malta_int.c')
-rw-r--r-- | arch/mips/mips-boards/malta/malta_int.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c index 64db07d4dbe5..7cc0ba4f553a 100644 --- a/arch/mips/mips-boards/malta/malta_int.c +++ b/arch/mips/mips-boards/malta/malta_int.c | |||
@@ -57,6 +57,7 @@ static inline int mips_pcibios_iack(void) | |||
57 | case MIPS_REVISION_CORID_CORE_MSC: | 57 | case MIPS_REVISION_CORID_CORE_MSC: |
58 | case MIPS_REVISION_CORID_CORE_FPGA2: | 58 | case MIPS_REVISION_CORID_CORE_FPGA2: |
59 | case MIPS_REVISION_CORID_CORE_FPGA3: | 59 | case MIPS_REVISION_CORID_CORE_FPGA3: |
60 | case MIPS_REVISION_CORID_CORE_24K: | ||
60 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 61 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
61 | MSC_READ(MSC01_PCI_IACK, irq); | 62 | MSC_READ(MSC01_PCI_IACK, irq); |
62 | irq &= 0xff; | 63 | irq &= 0xff; |
@@ -143,6 +144,7 @@ void corehi_irqdispatch(struct pt_regs *regs) | |||
143 | case MIPS_REVISION_CORID_CORE_MSC: | 144 | case MIPS_REVISION_CORID_CORE_MSC: |
144 | case MIPS_REVISION_CORID_CORE_FPGA2: | 145 | case MIPS_REVISION_CORID_CORE_FPGA2: |
145 | case MIPS_REVISION_CORID_CORE_FPGA3: | 146 | case MIPS_REVISION_CORID_CORE_FPGA3: |
147 | case MIPS_REVISION_CORID_CORE_24K: | ||
146 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 148 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
147 | ll_msc_irq(regs); | 149 | ll_msc_irq(regs); |
148 | break; | 150 | break; |
@@ -309,6 +311,7 @@ void __init arch_init_irq(void) | |||
309 | case MIPS_REVISION_CORID_CORE_MSC: | 311 | case MIPS_REVISION_CORID_CORE_MSC: |
310 | case MIPS_REVISION_CORID_CORE_FPGA2: | 312 | case MIPS_REVISION_CORID_CORE_FPGA2: |
311 | case MIPS_REVISION_CORID_CORE_FPGA3: | 313 | case MIPS_REVISION_CORID_CORE_FPGA3: |
314 | case MIPS_REVISION_CORID_CORE_24K: | ||
312 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 315 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
313 | if (cpu_has_veic) | 316 | if (cpu_has_veic) |
314 | init_msc_irqs (MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); | 317 | init_msc_irqs (MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); |