diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 21:25:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 21:25:39 -0800 |
commit | c60ecec67ab3f6b5791ef49d502b7a61909aa13e (patch) | |
tree | e8180ad2ec48a6063277ee51cf10dc8541dcac2f /arch/mips/pci/fixup-cobalt.c | |
parent | Revert "writeback: introduce writeback_control.more_io to indicate more io" (diff) | |
parent | [MIPS] Cacheops.h: Fix typo. (diff) | |
download | linux-dev-c60ecec67ab3f6b5791ef49d502b7a61909aa13e.tar.xz linux-dev-c60ecec67ab3f6b5791ef49d502b7a61909aa13e.zip |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cacheops.h: Fix typo.
[MIPS] Cobalt: Qube1 has no serial port so don't use it
[MIPS] Cobalt: Fix ethernet interrupts for RaQ1
[MIPS] Kconfig fixes for BCM47XX platform
Diffstat (limited to 'arch/mips/pci/fixup-cobalt.c')
-rw-r--r-- | arch/mips/pci/fixup-cobalt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c index f7df1142912b..9553b14002dd 100644 --- a/arch/mips/pci/fixup-cobalt.c +++ b/arch/mips/pci/fixup-cobalt.c @@ -177,7 +177,7 @@ static char irq_tab_raq2[] __initdata = { int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if (cobalt_board_id < COBALT_BRD_ID_QUBE2) + if (cobalt_board_id <= COBALT_BRD_ID_QUBE1) return irq_tab_qube1[slot]; if (cobalt_board_id == COBALT_BRD_ID_RAQ2) |