From 988a804629f03042f83cb99cf52d7cf9f55161a0 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 23 Sep 2005 13:23:58 +1000 Subject: [PATCH] --- yaml --- r: 11483 b: refs/heads/master c: acdbec1b8974f61b0cb69ebe57916f8721b2f3d7 h: refs/heads/master i: 11481: c496915fe533670d7a982acd504edd51b20b1798 11479: 1ccb24d556820f174f8201fafc7cba8129d29e48 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/iseries/Makefile | 2 +- .../HvLpConfig.c => powerpc/platforms/iseries/hvlpconfig.c} | 1 - trunk/arch/ppc64/kernel/Makefile | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) rename trunk/arch/{ppc64/kernel/HvLpConfig.c => powerpc/platforms/iseries/hvlpconfig.c} (98%) diff --git a/[refs] b/[refs] index 3848dc205a6e..934792446256 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba0dd617a3e23321a14cb38ff7ad6f796ba32c34 +refs/heads/master: acdbec1b8974f61b0cb69ebe57916f8721b2f3d7 diff --git a/trunk/arch/powerpc/platforms/iseries/Makefile b/trunk/arch/powerpc/platforms/iseries/Makefile index af0c7d97121d..3b7a31d4acda 100644 --- a/trunk/arch/powerpc/platforms/iseries/Makefile +++ b/trunk/arch/powerpc/platforms/iseries/Makefile @@ -1 +1 @@ -obj-$(CONFIG_PPC_ISERIES) += hvcall.o +obj-$(CONFIG_PPC_ISERIES) += hvcall.o hvlpconfig.o diff --git a/trunk/arch/ppc64/kernel/HvLpConfig.c b/trunk/arch/powerpc/platforms/iseries/hvlpconfig.c similarity index 98% rename from trunk/arch/ppc64/kernel/HvLpConfig.c rename to trunk/arch/powerpc/platforms/iseries/hvlpconfig.c index cb1d6473203c..dc28621aea0d 100644 --- a/trunk/arch/ppc64/kernel/HvLpConfig.c +++ b/trunk/arch/powerpc/platforms/iseries/hvlpconfig.c @@ -1,5 +1,4 @@ /* - * HvLpConfig.c * Copyright (C) 2001 Kyle A. Lucke, IBM Corporation * * This program is free software; you can redistribute it and/or modify diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile index aba3895b74d4..c80b6174231e 100644 --- a/trunk/arch/ppc64/kernel/Makefile +++ b/trunk/arch/ppc64/kernel/Makefile @@ -22,7 +22,7 @@ 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_PPC_ISERIES) += HvLpConfig.o LparData.o \ +obj-$(CONFIG_PPC_ISERIES) += LparData.o \ iSeries_setup.o ItLpQueue.o hvCall.o \ mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \ iSeries_iommu.o