aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/platforms/iseries/pci.c1
-rw-r--r--include/asm-powerpc/pci-bridge.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 30e3d992dc0d..931941036b91 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -438,7 +438,6 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev)
438 } 438 }
439 439
440 pdev->sysdata = node; 440 pdev->sysdata = node;
441 PCI_DN(node)->pcidev = pdev;
442 allocate_device_bars(pdev); 441 allocate_device_bars(pdev);
443 iseries_device_information(pdev, bus, *sub_bus); 442 iseries_device_information(pdev, bus, *sub_bus);
444 iommu_devnode_init_iSeries(pdev, node); 443 iommu_devnode_init_iSeries(pdev, node);
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index 07cdb5b786f0..29324047779d 100644
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -170,12 +170,12 @@ struct pci_dn {
170 170
171 struct pci_controller *phb; /* for pci devices */ 171 struct pci_controller *phb; /* for pci devices */
172 struct iommu_table *iommu_table; /* for phb's or bridges */ 172 struct iommu_table *iommu_table; /* for phb's or bridges */
173 struct pci_dev *pcidev; /* back-pointer to the pci device */
174 struct device_node *node; /* back-pointer to the device_node */ 173 struct device_node *node; /* back-pointer to the device_node */
175 174
176 int pci_ext_config_space; /* for pci devices */ 175 int pci_ext_config_space; /* for pci devices */
177 176
178#ifdef CONFIG_EEH 177#ifdef CONFIG_EEH
178 struct pci_dev *pcidev; /* back-pointer to the pci device */
179 int class_code; /* pci device class */ 179 int class_code; /* pci device class */
180 int eeh_mode; /* See eeh.h for possible EEH_MODEs */ 180 int eeh_mode; /* See eeh.h for possible EEH_MODEs */
181 int eeh_config_addr; 181 int eeh_config_addr;