diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-03-16 00:44:03 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 04:55:35 -0400 |
commit | 0f3e25049e0a54916d0991c1eaa5f8df926c7f92 (patch) | |
tree | 5307777ecb878310274e9406497c69080d775f91 /arch/sparc64/kernel | |
parent | 3996465392fd1632b671707d16bbc96a9481cfe2 (diff) |
[SPARC64]: Make sure pbm->prom_node is setup easly enough in psycho.c
It needs to be ready before we invoke pci_determine_mem_io_space().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel')
-rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 154c03290d5d..3725910c8b2b 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
@@ -1107,8 +1107,6 @@ static void psycho_pbm_init(struct pci_controller_info *p, | |||
1107 | if (prop) | 1107 | if (prop) |
1108 | pbm->chip_revision = *(int *) prop->value; | 1108 | pbm->chip_revision = *(int *) prop->value; |
1109 | 1109 | ||
1110 | pci_determine_mem_io_space(pbm); | ||
1111 | |||
1112 | pbm->parent = p; | 1110 | pbm->parent = p; |
1113 | pbm->prom_node = dp; | 1111 | pbm->prom_node = dp; |
1114 | pbm->name = dp->full_name; | 1112 | pbm->name = dp->full_name; |
@@ -1117,6 +1115,8 @@ static void psycho_pbm_init(struct pci_controller_info *p, | |||
1117 | pbm->name, | 1115 | pbm->name, |
1118 | pbm->chip_version, pbm->chip_revision); | 1116 | pbm->chip_version, pbm->chip_revision); |
1119 | 1117 | ||
1118 | pci_determine_mem_io_space(pbm); | ||
1119 | |||
1120 | prop = of_find_property(dp, "bus-range", NULL); | 1120 | prop = of_find_property(dp, "bus-range", NULL); |
1121 | busrange = prop->value; | 1121 | busrange = prop->value; |
1122 | pbm->pci_first_busno = busrange[0]; | 1122 | pbm->pci_first_busno = busrange[0]; |