powerpc/cell: Fix iommu breakage caused by controller_ops change
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 14 Apr 2015 06:49:06 +0000 (16:49 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 14 Apr 2015 07:13:31 +0000 (17:13 +1000)
The recent patch to convert cell to use pci_controller_ops had a small
bug which broke machines using an iommu.

The set of phb->controller_ops was added after the check for name !=
"pci", meaning pcix/pcie PHBs weren't getting their ops set correctly.

Fixes: 9c1368fc50e7 ("powerpc/cell: Move controller ops from ppc_md to controller_ops")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/cell/setup.c

Simple merge