[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>
2006-04-27 17:23:32 +10:00
parent dd721ffd95
commit c7f0e8cb56
9 changed files with 168 additions and 249 deletions
--- 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.