diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-07 05:24:55 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-07 05:24:55 +0200 |
| commit | 428d4d6520a0b8683fe9eac6df3077001e13d00b (patch) | |
| tree | 8afa1af0babc8f2c375acc244aae969846dfe199 /drivers/pci | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwoo... (diff) | |
| parent | powerpc/powernv: Don't map M64 segments using M32DT (diff) | |
| download | linux-428d4d6520a0b8683fe9eac6df3077001e13d00b.tar.xz linux-428d4d6520a0b8683fe9eac6df3077001e13d00b.zip | |
Merge branch 'next-eeh' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/rpadlpar_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index 7660232ef460..e12bafdc42e0 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -146,7 +146,7 @@ static void dlpar_pci_add_bus(struct device_node *dn) struct pci_controller *phb = pdn->phb; struct pci_dev *dev = NULL; - eeh_add_device_tree_early(dn); + eeh_add_device_tree_early(pdn); /* Add EADS device to PHB bus, adding new entry to bus->devices */ dev = of_create_pci_dev(dn, phb->bus, pdn->devfn); |