diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-08 02:24:05 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-08 19:41:32 -0400 |
commit | f1cd8de2c951e206b57fd76aff279cf13ea25815 (patch) | |
tree | 67b24b716b53fbcc6bdfcbfe6d75e1348e0e9f1a /arch/sparc64/kernel/pci_psycho.c | |
parent | 96a496fd49fb2c3178128237ae4691b7c7df3a3d (diff) |
[SPARC64]: Move pci_ops into pci_pbm_info.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_psycho.c')
-rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 4801eb441236..405c1dba781b 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
@@ -1087,6 +1087,7 @@ static void psycho_pbm_init(struct pci_controller_info *p, | |||
1087 | pci_pbm_root = pbm; | 1087 | pci_pbm_root = pbm; |
1088 | 1088 | ||
1089 | pbm->scan_bus = psycho_scan_bus; | 1089 | pbm->scan_bus = psycho_scan_bus; |
1090 | pbm->pci_ops = &psycho_ops; | ||
1090 | 1091 | ||
1091 | pbm->chip_type = PBM_CHIP_TYPE_PSYCHO; | 1092 | pbm->chip_type = PBM_CHIP_TYPE_PSYCHO; |
1092 | pbm->chip_version = 0; | 1093 | pbm->chip_version = 0; |
@@ -1155,7 +1156,6 @@ void psycho_init(struct device_node *dp, char *model_name) | |||
1155 | p->pbm_A.portid = upa_portid; | 1156 | p->pbm_A.portid = upa_portid; |
1156 | p->pbm_B.portid = upa_portid; | 1157 | p->pbm_B.portid = upa_portid; |
1157 | p->index = pci_num_controllers++; | 1158 | p->index = pci_num_controllers++; |
1158 | p->pci_ops = &psycho_ops; | ||
1159 | 1159 | ||
1160 | prop = of_find_property(dp, "reg", NULL); | 1160 | prop = of_find_property(dp, "reg", NULL); |
1161 | pr_regs = prop->value; | 1161 | pr_regs = prop->value; |