aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-04-08 17:26:45 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-04-08 17:26:45 +0000
commit62684a84719d520cd7a66273bb8767b8b94fc322 (patch)
treee41d31e3ba89cbf9bdbd5b4f53fce82d36e66119 /target/linux
parentebfd23d3b4233965b9094f640f633228f0b44984 (diff)
downloadupstream-62684a84719d520cd7a66273bb8767b8b94fc322.tar.gz
upstream-62684a84719d520cd7a66273bb8767b8b94fc322.tar.bz2
upstream-62684a84719d520cd7a66273bb8767b8b94fc322.zip
Re-enable MPI/PCI code
SVN-Revision: 6897
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/setup.c8
1 files changed, 1 insertions, 7 deletions
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 bc28b549e5..70c6ebe601 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 <linux/pci.h>
#include <linux/delay.h>
#include <bcm_map_part.h>
+#include <6348_map_part.h>
#include <bcmpci.h>
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
}