mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'next-eeh' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next
This commit is contained in:
commit
428d4d6520
28 changed files with 1652 additions and 1648 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue