From 37638e0d910222c94240b5f2d088b8c17539fe25 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 21 Dec 2007 15:49:11 +1100 Subject: [PATCH] --- yaml --- r: 81241 b: refs/heads/master c: b6ed42a794e1ca51fb46ff2bdc562315c46dd9a8 h: refs/heads/master i: 81239: 4ed0532d58dd0cdd5d67580b5f6eb5cf5b0ba2ff v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/iseries/pci.c | 1 - trunk/include/asm-powerpc/pci-bridge.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c2eadb0d3ead..55fe0600757d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86bcab492cfdbaad144bdfb453b4e9db6117a7a5 +refs/heads/master: b6ed42a794e1ca51fb46ff2bdc562315c46dd9a8 diff --git a/trunk/arch/powerpc/platforms/iseries/pci.c b/trunk/arch/powerpc/platforms/iseries/pci.c index 30e3d992dc0d..931941036b91 100644 --- a/trunk/arch/powerpc/platforms/iseries/pci.c +++ b/trunk/arch/powerpc/platforms/iseries/pci.c @@ -438,7 +438,6 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev) } pdev->sysdata = node; - PCI_DN(node)->pcidev = pdev; allocate_device_bars(pdev); iseries_device_information(pdev, bus, *sub_bus); iommu_devnode_init_iSeries(pdev, node); diff --git a/trunk/include/asm-powerpc/pci-bridge.h b/trunk/include/asm-powerpc/pci-bridge.h index 07cdb5b786f0..29324047779d 100644 --- a/trunk/include/asm-powerpc/pci-bridge.h +++ b/trunk/include/asm-powerpc/pci-bridge.h @@ -170,12 +170,12 @@ struct pci_dn { struct pci_controller *phb; /* for pci devices */ struct iommu_table *iommu_table; /* for phb's or bridges */ - struct pci_dev *pcidev; /* back-pointer to the pci device */ struct device_node *node; /* back-pointer to the device_node */ int pci_ext_config_space; /* for pci devices */ #ifdef CONFIG_EEH + struct pci_dev *pcidev; /* back-pointer to the pci device */ int class_code; /* pci device class */ int eeh_mode; /* See eeh.h for possible EEH_MODEs */ int eeh_config_addr;