---

yaml --- r: 11495 b: refs/heads/master c: ed7f2c0 h: refs/heads/master i: 11493: 37bdbf4 11491: 9ba8ef8 11487: f4674e9 v: v3
git-mirror · Sep 27, 2005 · 9a8a308 · 9a8a308
1 parent 84ce22a
commit 9a8a308
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 → trunk/arch/powerpc/platforms/iseries/vio.c b/trunk/arch/ppc64/kernel/iSeries_vio.c → trunk/arch/powerpc/platforms/iseries/vio.c
diff --git 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