]> err.no Git - linux-2.6/commit
[PATCH] powerpc: merge the rest of the vio code
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Apr 2006 07:23:32 +0000 (17:23 +1000)
committerPaul Mackerras <paulus@samba.org>
Sat, 29 Apr 2006 08:02:02 +0000 (18:02 +1000)
commitc7f0e8cb5654a50986c6097b3c0cca972e406899
treedc8a8e590c5cf97d8b7cae2f1e93bdbef178f89f
parentdd721ffd95d5e1516380da0b254ef737582a258f
[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/kernel/vio.c
arch/powerpc/platforms/iseries/Makefile
arch/powerpc/platforms/iseries/iommu.c
arch/powerpc/platforms/iseries/pci.c
arch/powerpc/platforms/iseries/vio.c [deleted file]
arch/powerpc/platforms/pseries/Makefile
arch/powerpc/platforms/pseries/vio.c [deleted file]
include/asm-powerpc/iseries/iommu.h [moved from arch/powerpc/platforms/iseries/iommu.h with 90% similarity]
include/asm-powerpc/vio.h