Commit 6f2dbcb9 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://lia64.bkbits.net/to-linus-2.5

into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents 219b5ec0 99dd57a5
...@@ -289,8 +289,11 @@ void iommu_setup_pmac(void) ...@@ -289,8 +289,11 @@ void iommu_setup_pmac(void)
* things simple. Setup all PCI devices to point to this table * things simple. Setup all PCI devices to point to this table
*/ */
while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
dn = PCI_GET_DN(dev); /* We must use pci_device_to_OF_node() to make sure that
* we get the real "final" pointer to the device in the
* pci_dev sysdata and not the temporary PHB one
*/
struct device_node *dn = pci_device_to_OF_node(dev);
if (dn) if (dn)
dn->iommu_table = &iommu_table_pmac; dn->iommu_table = &iommu_table_pmac;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment