1 files changed, 5 insertions, 11 deletions

diff --git a/arch/sparc64/kernel/pci_impl.h b/arch/sparc64/kernel/pci_impl.h
index 4125f7513c69..4937ce903a88 100644
--- a/arch/sparc64/kernel/pci_impl.h
+++ b/arch/sparc64/kernel/pci_impl.h
@@ -56,15 +56,11 @@ struct sparc64_msiq_cookie {
 };
 #endif
 
-struct pci_controller_info;
-
 struct pci_pbm_info {
         struct pci_pbm_info             *next;
+        struct pci_pbm_info             *sibling;
         int                             index;
 
-        /* PCI controller we sit under. */
-        struct pci_controller_info      *parent;
-
         /* Physical address base of controller registers. */
         unsigned long                   controller_regs;
 
@@ -107,6 +103,10 @@ struct pci_pbm_info {
         /* This will be 12 on PCI-E controllers, 8 elsewhere.  */
         unsigned long                   config_space_reg_bits;
 
+        unsigned long                   pci_afsr;
+        unsigned long                   pci_afar;
+        unsigned long                   pci_csr;
+
         /* State of 66MHz capabilities on this PBM. */
         int                             is_66mhz_capable;
         int                             all_devs_66mhz;
@@ -151,12 +151,6 @@ struct pci_pbm_info {
         int                             numa_node;
 };
 
-struct pci_controller_info {
-        /* The PCI bus modules controlled by us. */
-        struct pci_pbm_info             pbm_A;
-        struct pci_pbm_info             pbm_B;
-};
-
 extern struct pci_pbm_info *pci_pbm_root;
 
 extern int pci_num_pbms;