1 files changed, 7 insertions, 8 deletions

diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h
index 1396f110939a..cebe80b1da6c 100644
--- a/include/asm-sparc64/pbm.h
+++ b/include/asm-sparc64/pbm.h
@@ -15,6 +15,7 @@
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/oplib.h>
+#include <asm/prom.h>
 #include <asm/iommu.h>
 
 /* The abstraction used here is that there are PCI controllers,
@@ -153,16 +154,15 @@ struct pci_pbm_info {
         int                             chip_revision;
 
         /* Name used for top-level resources. */
-        char                            name[64];
+        char                            *name;
 
         /* OBP specific information. */
-        int                             prom_node;
-        char                            prom_name[64];
-        struct linux_prom_pci_ranges    pbm_ranges[PROM_PCIRNG_MAX];
+        struct device_node              *prom_node;
+        struct linux_prom_pci_ranges    *pbm_ranges;
         int                             num_pbm_ranges;
-        struct linux_prom_pci_intmap    pbm_intmap[PROM_PCIIMAP_MAX];
+        struct linux_prom_pci_intmap    *pbm_intmap;
         int                             num_pbm_intmap;
-        struct linux_prom_pci_intmask   pbm_intmask;
+        struct linux_prom_pci_intmask   *pbm_intmask;
         u64                             ino_bitmap;
 
         /* PBM I/O and Memory space resources. */
@@ -227,8 +227,7 @@ struct pci_controller_info {
  */
 struct pcidev_cookie {
         struct pci_pbm_info             *pbm;
-        char                            prom_name[64];
-        int                             prom_node;
+        struct device_node              *prom_node;
         struct linux_prom_pci_registers prom_regs[PROMREG_MAX];
         int num_prom_regs;
         struct linux_prom_pci_registers prom_assignments[PROMREG_MAX];