diff options
author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2008-07-14 16:58:47 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 18:44:39 +0100 |
commit | b27418aa551a153e8bf1bd16cf93e5786f9590a9 (patch) | |
tree | 568fdf598effa5fe58e10781595392f101198529 /arch/mips/pci | |
parent | 0b56fd8c7abbf85baeecb77be25c54d3c7d11587 (diff) | |
download | talos-obmc-linux-b27418aa551a153e8bf1bd16cf93e5786f9590a9.tar.gz talos-obmc-linux-b27418aa551a153e8bf1bd16cf93e5786f9590a9.zip |
[MIPS] Remove mips_machtype for LASAT machines
This is the LASAT part of the mips_machtype removal.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/pci-lasat.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c index e70ae3236e0b..a98e543a514a 100644 --- a/arch/mips/pci/pci-lasat.c +++ b/arch/mips/pci/pci-lasat.c @@ -10,7 +10,7 @@ #include <linux/pci.h> #include <linux/types.h> -#include <asm/bootinfo.h> +#include <asm/lasat/lasat.h> #include <irq.h> @@ -39,16 +39,10 @@ static int __init lasat_pci_setup(void) { printk(KERN_DEBUG "PCI: starting\n"); - switch (mips_machtype) { - case MACH_LASAT_100: - lasat_pci_controller.pci_ops = >64xxx_pci0_ops; - break; - case MACH_LASAT_200: + if (IS_LASAT_200()) lasat_pci_controller.pci_ops = &nile4_pci_ops; - break; - default: - panic("pcibios_init: mips_machtype incorrect"); - } + else + lasat_pci_controller.pci_ops = >64xxx_pci0_ops; register_pci_controller(&lasat_pci_controller); |