| Message ID | 20090901120502.2b40b3b1.sfr@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index 72c31bc..7311fdf 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c @@ -139,6 +139,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, dev->dev.bus = &pci_bus_type; dev->devfn = devfn; dev->multifunction = 0; /* maybe a lie? */ + dev->needs_freset = 0; /* pcie fundamental reset required */ dev->vendor = get_int_prop(node, "vendor-id", 0xffff); dev->device = get_int_prop(node, "device-id", 0xffff);
Hi Jesse, Today's linux-next merge of the pci tree got a conflict in arch/powerpc/kernel/pci_64.c between commit fbe65447197789a3ccccc27755956f6a4c445089 ("powerpc/pci: move pci_64.c device tree scanning code into pci-common.c") from the powerpc tree and commit ced66a36d35607c60d18bb531527acd2083c0523 ("PCI/powerpc: support PCIe fundamental reset") from the pci tree. The former moved the code that is modified by the latter into another file. I fixed it up (see below) and can carry the fix as necessary.