diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:49:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:49:55 -0700 |
| commit | 24665cd00dd06c741ef6268515ca9e6d3cda5c57 (patch) | |
| tree | d55e925db2b78bc6529965fa6b1df07a76b56610 /arch/ppc64/kernel/irq.c | |
| parent | fed2fc18a4567d613cd35115322257c6c6c710e9 (diff) | |
| parent | d7152fe14cad075d6dd4ee4194acd131aed0244e (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/irq.c')
| -rw-r--r-- | arch/ppc64/kernel/irq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c index d860467b8f0..3defc8c33ad 100644 --- a/arch/ppc64/kernel/irq.c +++ b/arch/ppc64/kernel/irq.c @@ -395,6 +395,9 @@ int virt_irq_create_mapping(unsigned int real_irq) if (ppc64_interrupt_controller == IC_OPEN_PIC) return real_irq; /* no mapping for openpic (for now) */ + if (ppc64_interrupt_controller == IC_BPA_IIC) + return real_irq; /* no mapping for iic either */ + /* don't map interrupts < MIN_VIRT_IRQ */ if (real_irq < MIN_VIRT_IRQ) { virt_irq_to_real_map[real_irq] = real_irq; |