commit c7f0e8cb5654a50986c6097b3c0cca972e406899
author Stephen Rothwell <sfr@canb.auug.org.au> Thu Apr 27 17:23:32 2006 +1000
committer Paul Mackerras <paulus@samba.org> Sat Apr 29 18:02:02 2006 +1000
tree dc8a8e590c5cf97d8b7cae2f1e93bdbef178f89f
parent dd721ffd95d5e1516380da0b254ef737582a258f

[PATCH] powerpc: merge the rest of the vio code

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

arch/powerpc/platforms/iseries/pci.c

diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 5a61c6f..428ffb5 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -37,13 +37,13 @@
 
 #include <asm/iseries/hv_call_xm.h>
 #include <asm/iseries/mf.h>
+#include <asm/iseries/iommu.h>
 
 #include <asm/ppc-pci.h>
 
 #include "irq.h"
 #include "pci.h"
 #include "call_pci.h"
-#include "iommu.h"
 
 /*
  * Forward declares of prototypes.