From eda3564cf93d6c762c3fb40f6034593935863a31 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Thu, 3 Nov 2005 18:49:51 -0600 Subject: [PATCH] --- yaml --- r: 13712 b: refs/heads/master c: 7f79da7accd63a6adb84f4602f66779f6a701e7b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/Makefile | 1 + trunk/arch/{ppc64/kernel => powerpc/platforms/pseries}/eeh.c | 0 trunk/arch/ppc64/kernel/Makefile | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/{ppc64/kernel => powerpc/platforms/pseries}/eeh.c (100%) diff --git a/[refs] b/[refs] index f6c46a1dd6a4..f862edc1110f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8632c822719cce08cfb128859e354007744cbba +refs/heads/master: 7f79da7accd63a6adb84f4602f66779f6a701e7b diff --git a/trunk/arch/powerpc/platforms/pseries/Makefile b/trunk/arch/powerpc/platforms/pseries/Makefile index b9938fece781..dbdffb2fe429 100644 --- a/trunk/arch/powerpc/platforms/pseries/Makefile +++ b/trunk/arch/powerpc/platforms/pseries/Makefile @@ -3,3 +3,4 @@ obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_XICS) += xics.o +obj-$(CONFIG_EEH) += eeh.o diff --git a/trunk/arch/ppc64/kernel/eeh.c b/trunk/arch/powerpc/platforms/pseries/eeh.c similarity index 100% rename from trunk/arch/ppc64/kernel/eeh.c rename to trunk/arch/powerpc/platforms/pseries/eeh.c diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile index eb3187f18fb0..7548968b7997 100644 --- a/trunk/arch/ppc64/kernel/Makefile +++ b/trunk/arch/ppc64/kernel/Makefile @@ -30,7 +30,6 @@ endif obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o obj-$(CONFIG_KEXEC) += machine_kexec.o -obj-$(CONFIG_EEH) += eeh.o obj-$(CONFIG_PROC_FS) += proc_ppc64.o obj-$(CONFIG_MODULES) += module.o ifneq ($(CONFIG_PPC_MERGE),y)