diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 10:38:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 10:38:02 -0700 |
commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /arch/ppc64/kernel/pmac_feature.c | |
parent | 0b968d23610d65a46299347b141a687e207bd294 (diff) | |
parent | b2ad7b5e8115582cdf5bbda065aa516c24d62c21 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/pmac_feature.c')
-rw-r--r-- | arch/ppc64/kernel/pmac_feature.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/pmac_feature.c b/arch/ppc64/kernel/pmac_feature.c index 98ed2bccab1..eb4e6c3f694 100644 --- a/arch/ppc64/kernel/pmac_feature.c +++ b/arch/ppc64/kernel/pmac_feature.c @@ -674,6 +674,7 @@ void __init pmac_check_ht_link(void) #if 0 /* Disabled for now */ u32 ufreq, freq, ucfg, cfg; struct device_node *pcix_node; + struct pci_dn *pdn; u8 px_bus, px_devfn; struct pci_controller *px_hose; @@ -687,9 +688,10 @@ void __init pmac_check_ht_link(void) printk("No PCI-X bridge found\n"); return; } - px_hose = pcix_node->phb; - px_bus = pcix_node->busno; - px_devfn = pcix_node->devfn; + pdn = pcix_node->data; + px_hose = pdn->phb; + px_bus = pdn->busno; + px_devfn = pdn->devfn; early_read_config_dword(px_hose, px_bus, px_devfn, 0xc4, &cfg); early_read_config_dword(px_hose, px_bus, px_devfn, 0xcc, &freq); |