From 9a8a308820d8a38e60cb744f1441e61ed068613b Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 28 Sep 2005 03:03:00 +1000 Subject: [PATCH] --- yaml --- r: 11495 b: refs/heads/master c: ed7f2c05de956da72baf066701ac642f7215dbf5 h: refs/heads/master i: 11493: 37bdbf483749142c7918430ebb42f23ca2146fc8 11491: 9ba8ef8c6f11fd4e73effdcd5cbde78fbd88ff1d 11487: f4674e91f9069c0a8263efa05b0929fe09250502 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/iseries/Makefile | 1 + .../kernel/iSeries_vio.c => powerpc/platforms/iseries/vio.c} | 0 trunk/arch/ppc64/kernel/Makefile | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/{ppc64/kernel/iSeries_vio.c => powerpc/platforms/iseries/vio.c} (100%) diff --git a/[refs] b/[refs] index 2ce1c88e34d8..96e52c5bf915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da3420fcd62a8967c14a586355e322253a1504a8 +refs/heads/master: ed7f2c05de956da72baf066701ac642f7215dbf5 diff --git a/trunk/arch/powerpc/platforms/iseries/Makefile b/trunk/arch/powerpc/platforms/iseries/Makefile index d10305d7ad2f..3a1ed16963a4 100644 --- a/trunk/arch/powerpc/platforms/iseries/Makefile +++ b/trunk/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/trunk/arch/ppc64/kernel/iSeries_vio.c b/trunk/arch/powerpc/platforms/iseries/vio.c similarity index 100% rename from trunk/arch/ppc64/kernel/iSeries_vio.c rename to trunk/arch/powerpc/platforms/iseries/vio.c diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile index 8b2743697c38..7354c1dbe9f0 100644 --- a/trunk/arch/ppc64/kernel/Makefile +++ b/trunk/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