瀏覽代碼

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

And rename it to vpdinfo.c.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell 19 年之前
父節點
當前提交
da3420fcd6
共有 3 個文件被更改,包括 1 次插入4 次删除
  1. 1 1
      arch/powerpc/platforms/iseries/Makefile
  2. 0 2
      arch/powerpc/platforms/iseries/vpdinfo.c
  3. 0 1
      arch/ppc64/kernel/Makefile

+ 1 - 1
arch/powerpc/platforms/iseries/Makefile

@@ -1,3 +1,3 @@
 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \
 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \
 	hvcall.o proc.o htab.o iommu.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

+ 0 - 2
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
  * This code gets the card location of the hardware
  * Copyright (C) 2001  <Allan H Trautman> <IBM Corp>
  * Copyright (C) 2001  <Allan H Trautman> <IBM Corp>
  * Copyright (C) 2005  Stephen Rothwel, IBM Corp
  * Copyright (C) 2005  Stephen Rothwel, IBM Corp

+ 0 - 1
arch/ppc64/kernel/Makefile

@@ -16,7 +16,6 @@ obj-y += vdso32/ vdso64/
 
 
 obj-$(CONFIG_PPC_OF) +=	of_device.o
 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
 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)
 obj-$(CONFIG_PCI)	+= pci.o pci_iommu.o iomap.o $(pci-obj-y)