The following commit has been merged in the linux branch: commit 39d2211d20518677511043d7ee16bbca6d0c5070 Author: Ralf Baechle ralf@linux-mips.org Date: Mon Oct 12 02:23:48 2009 +0200

MIPS: MTX-1: Fix build if CONFIG_PCI is disabled.

Signed-off-by: Ralf Baechle ralf@linux-mips.org

diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c index cc32c69..45b61c9 100644 --- a/arch/mips/alchemy/mtx-1/board_setup.c +++ b/arch/mips/alchemy/mtx-1/board_setup.c @@ -69,6 +69,7 @@ void __init board_setup(void) #else au_writel(0xf, Au1500_PCI_CFG); #endif + board_pci_idsel = mtx1_pci_idsel; #endif

/* Initialize sys_pinfunc */ @@ -85,8 +86,6 @@ void __init board_setup(void) alchemy_gpio_direction_output(211, 1); /* green on */ alchemy_gpio_direction_output(212, 0); /* red off */

- board_pci_idsel = mtx1_pci_idsel; - printk(KERN_INFO "4G Systems MTX-1 Board\n"); }