aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavem <davem>2002-02-01 00:58:33 +0000
committerdavem <davem>2002-02-01 00:58:33 +0000
commitaced4e4814e8a94209d25269be6b39cbf87e3724 (patch)
tree4bd62d0ad8cd11f12b830aea5464e24588f8b419
parentdf70ce0ae7fd2f5582fd22d02a2416d4ffa36a1d (diff)
downloadnetdev-vger-cvs-aced4e4814e8a94209d25269be6b39cbf87e3724.tar.gz
Now remove central_bus pci_first_slot hack
because the real bug is fixed.
-rw-r--r--arch/sparc64/kernel/pci_psycho.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index e9b3d744f..56b928def 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1,4 +1,4 @@
-/* $Id: pci_psycho.c,v 1.32 2002-01-23 11:27:32 davem Exp $
+/* $Id: pci_psycho.c,v 1.33 2002-02-01 00:58:33 davem Exp $
* pci_psycho.c: PSYCHO/U2P specific PCI controller support.
*
* Copyright (C) 1997, 1998, 1999 David S. Miller (davem@caipfs.rutgers.edu)
@@ -13,7 +13,6 @@
#include <linux/slab.h>
#include <asm/pbm.h>
-#include <asm/fhc.h>
#include <asm/iommu.h>
#include <asm/irq.h>
#include <asm/starfire.h>
@@ -1495,8 +1494,6 @@ static void psycho_pbm_init(struct pci_controller_info *p,
} else {
pbm = &p->pbm_B;
pbm->pci_first_slot = 2;
- if (central_bus != NULL)
- pbm->pci_first_slot = 1;
pbm->io_space.start = p->controller_regs + PSYCHO_IOSPACE_B;
pbm->mem_space.start = p->controller_regs + PSYCHO_MEMSPACE_B;
}