---

yaml --- r: 11494 b: refs/heads/master c: da3420f h: refs/heads/master v: v3
git-mirror · Sep 27, 2005 · 84ce22a · 84ce22a
1 parent 37bdbf4
commit 84ce22a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb4cf8056ead24ef0595859952319e2a608d5e07
+refs/heads/master: da3420fcd62a8967c14a586355e322253a1504a8
diff --git a/trunk/arch/powerpc/platforms/iseries/Makefile b/trunk/arch/powerpc/platforms/iseries/Makefile
@@ -1,3 +1,3 @@
 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
+obj-$(CONFIG_PCI) += pci.o irq.o vpdinfo.o
diff --git a/trunk/arch/ppc64/kernel/iSeries_VpdInfo.c → .../arch/powerpc/platforms/iseries/vpdinfo.c b/trunk/arch/ppc64/kernel/iSeries_VpdInfo.c → .../arch/powerpc/platforms/iseries/vpdinfo.c
@@ -1,6 +1,4 @@
 /*
- * File iSeries_vpdInfo.c created by Allan Trautman on Fri Feb  2 2001.
- *
  * This code gets the card location of the hardware
  * Copyright (C) 2001  <Allan H Trautman> <IBM Corp>
  * Copyright (C) 2005  Stephen Rothwel, IBM Corp

diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile
@@ -16,7 +16,6 @@ obj-y += vdso32/ vdso64/
 
 obj-$(CONFIG_PPC_OF) +=	of_device.o
 
-pci-obj-$(CONFIG_PPC_ISERIES)	+= iSeries_VpdInfo.o
 pci-obj-$(CONFIG_PPC_MULTIPLATFORM)	+= pci_dn.o pci_direct_iommu.o
 
 obj-$(CONFIG_PCI)	+= pci.o pci_iommu.o iomap.o $(pci-obj-y)