diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-08 17:26:45 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-08 17:26:45 +0000 |
| commit | 147d8ef4ccbc77883aaa772471e6cd9e879bbafe (patch) | |
| tree | 43e4ec242fe25b294b142a18402fd246f8d1ab0b /target/linux/brcm63xx-2.6/files/arch/mips | |
| parent | f720de03be1647e484820e14cdf3cacb3085dbec (diff) | |
Re-enable MPI/PCI code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6897 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx-2.6/files/arch/mips')
| -rw-r--r-- | target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/setup.c | 8 |
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 bc28b549e..70c6ebe60 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 } |