Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index e751506323b4..1e89a72fd030 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -135,7 +135,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
         pr_debug("    create device, devfn: %x, type: %s\n", devfn, type);
 
         dev->bus = bus;
-        dev->sysdata = node;
+        dev->dev.of_node = of_node_get(node);
         dev->dev.parent = bus->bridge;
         dev->dev.bus = &pci_bus_type;
         dev->devfn = devfn;
@@ -238,7 +238,7 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
         bus->primary = dev->bus->number;
         bus->subordinate = busrange[1];
         bus->bridge_ctl = 0;
-        bus->sysdata = node;
+        bus->dev.of_node = of_node_get(node);
 
         /* parse ranges property */
         /* PCI #address-cells == 3 and #size-cells == 2 always */