powerpc: Move iSeries_vio.c to powerpc/platforms/iseries

And rename it to vio.c.

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

diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
index d10305d7ad2f82a45c73641c039a3a4837f42c32..3a1ed16963a4332c1f882f3012c2ecd9be92bb2e 100644 (file)
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -1,3 +1,4 @@
 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \
        hvcall.o proc.o htab.o iommu.o
 obj-$(CONFIG_PCI) += pci.o irq.o vpdinfo.o
+obj-$(CONFIG_IBMVIO) += vio.o

diff --git a/arch/ppc64/kernel/iSeries_vio.c b/arch/powerpc/platforms/iseries/vio.c
similarity index 100%
rename from arch/ppc64/kernel/iSeries_vio.c
rename to arch/powerpc/platforms/iseries/vio.c

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 8b2743697c38aa0a23cd14b8ef0def81a68c01df..7354c1dbe9f01109a82aeace4ed8fa9c38908fd4 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_BOOTX_TEXT)      += btext.o
 obj-$(CONFIG_HVCS)             += hvcserver.o
 
 vio-obj-$(CONFIG_PPC_PSERIES)  += pSeries_vio.o
-vio-obj-$(CONFIG_PPC_ISERIES)  += iSeries_vio.o
 obj-$(CONFIG_IBMVIO)           += vio.o $(vio-obj-y)
 obj-$(CONFIG_XICS)             += xics.o
 obj-$(CONFIG_MPIC)             += mpic.o