diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/setup.c b/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/setup.c index bc28b549e5c..70c6ebe6013 100644 --- a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/setup.c +++ b/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/setup.c @@ -47,14 +47,13 @@ extern void brcm_time_init(void); extern int boot_loader_type; -#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI) #include #include #include +#include <6348_map_part.h> #include static volatile MpiRegisters * mpi = (MpiRegisters *)(MPI_BASE); -#endif /* This function should be in a board specific directory. For now, * assume that all boards that include this file use a Broadcom chip @@ -73,8 +72,6 @@ static void brcm_machine_halt(void) while (1); } -#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI) - static void mpi_SetLocalPciConfigReg(uint32 reg, uint32 value) { /* write index then value */ @@ -461,7 +458,6 @@ static int mpi_init(void) return 0; } -#endif void __init plat_mem_setup(void) { @@ -471,8 +467,6 @@ void __init plat_mem_setup(void) board_time_init = brcm_time_init; -#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI) /* mpi initialization */ mpi_init(); -#endif }