Attachment #66462 for bug #148214

View | Details | Raw Unified | Return to bug 148214
Collapse All | Expand All

Lines 465-472 u32 *of_get_pci_address(struct device_no Link Here

(-)linux-2.6.16-rc2-olh/arch/powerpc/kernel/prom_parse.c (-1 / +3 lines)
465	if (parent == NULL)	465	if (parent == NULL)
466	return NULL;	466	return NULL;
467	bus = of_match_bus(parent);	467	bus = of_match_bus(parent);
468	if (strcmp(bus->name, "pci"))	468	if (strcmp(bus->name, "pci")) {
		469	of_node_put(parent);
469	return NULL;	470	return NULL;
		471	}
470	bus->count_cells(dev, &na, &ns);	472	bus->count_cells(dev, &na, &ns);
471	of_node_put(parent);	473	of_node_put(parent);
472	if (!OF_CHECK_COUNTS(na, ns))	474	if (!OF_CHECK_COUNTS(na, ns))

Lines 204-212 static void __init setup_peg2(struct pci Link Here

(-)linux-2.6.16-rc2-olh/arch/powerpc/platforms/chrp/pci.c (+2 lines)
204	struct device_node *root = find_path_device("/");	204	struct device_node *root = find_path_device("/");
205	struct device_node *rtas;	205	struct device_node *rtas;
206		206
		207	of_node_get(root);
207	rtas = of_find_node_by_name (root, "rtas");	208	rtas = of_find_node_by_name (root, "rtas");
208	if (rtas) {	209	if (rtas) {
209	hose->ops = &rtas_pci_ops;	210	hose->ops = &rtas_pci_ops;
		211	of_node_put(rtas);
210	} else {	212	} else {
211	printk ("RTAS supporting Pegasos OF not found, please upgrade"	213	printk ("RTAS supporting Pegasos OF not found, please upgrade"
212	" your firmware\n");	214	" your firmware\n");

Return to bug 148214