On Jul 26, 2012, at 7:30 AM, Jia Hongtao wrote: > PCI initialization is now done by PCI controller driver. In board_setup_arch > stage we don't need PCI init any more but swiotlb should be determined at this > stage. > > Signed-off-by: Jia Hongtao <b38...@freescale.com> > Signed-off-by: Li Yang <le...@freescale.com> > --- > We now just apply this for mpc85xx_ds and qemu > > arch/powerpc/kernel/iommu.c.rej | 22 ----------------- > arch/powerpc/platforms/85xx/common.c | 9 +++++++ > arch/powerpc/platforms/85xx/mpc85xx_ds.c | 38 +++++++---------------------- > arch/powerpc/platforms/85xx/qemu_e500.c | 5 +++- > 4 files changed, 22 insertions(+), 52 deletions(-) > delete mode 100644 arch/powerpc/kernel/iommu.c.rej
removal of iommu.c.rej is handled by: commit 668fcb6972177489bdc01a66d697c3b494aa8a24 Author: Benjamin Herrenschmidt <b...@kernel.crashing.org> Date: Mon Jul 23 09:38:53 2012 +1000 Remove stale .rej file - k _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev