From 16f3281f5753c0cf7711f8aa26dc4f95ca55f3bb Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Mon, 27 Mar 2006 20:09:04 +1100 Subject: [PATCH] --- yaml --- r: 24631 b: refs/heads/master c: 8b844dd7591a820a618a8fb33c9c43186d43d1b9 h: refs/heads/master i: 24629: 5797c974f86d5f26cfef041159b2589612b811c3 24627: a234219752f23ac302ea053d11394b9291b690ce 24623: 63b464e66309ad5facf8e79ed71614c8c62c6a34 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/Makefile | 1 + trunk/arch/{ppc => powerpc}/kernel/perfmon_fsl_booke.c | 0 trunk/arch/ppc/kernel/Makefile | 6 ------ 4 files changed, 2 insertions(+), 7 deletions(-) rename trunk/arch/{ppc => powerpc}/kernel/perfmon_fsl_booke.c (100%) diff --git a/[refs] b/[refs] index 2a7fbbfbdcec..d73a1718dc8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed981856ca8af30912fd61a6a4ac8d30a453a5ec +refs/heads/master: 8b844dd7591a820a618a8fb33c9c43186d43d1b9 diff --git a/trunk/arch/powerpc/kernel/Makefile b/trunk/arch/powerpc/kernel/Makefile index b86d380f01b4..0cc0995b81b0 100644 --- a/trunk/arch/powerpc/kernel/Makefile +++ b/trunk/arch/powerpc/kernel/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o obj-$(CONFIG_TAU) += tau_6xx.o obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o obj32-$(CONFIG_MODULES) += module_32.o +obj-$(CONFIG_E500) += perfmon_fsl_booke.o ifeq ($(CONFIG_PPC_MERGE),y) diff --git a/trunk/arch/ppc/kernel/perfmon_fsl_booke.c b/trunk/arch/powerpc/kernel/perfmon_fsl_booke.c similarity index 100% rename from trunk/arch/ppc/kernel/perfmon_fsl_booke.c rename to trunk/arch/powerpc/kernel/perfmon_fsl_booke.c diff --git a/trunk/arch/ppc/kernel/Makefile b/trunk/arch/ppc/kernel/Makefile index e55d7ee17957..4b7a05655cf7 100644 --- a/trunk/arch/ppc/kernel/Makefile +++ b/trunk/arch/ppc/kernel/Makefile @@ -19,9 +19,6 @@ obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_RAPIDIO) += rio.o obj-$(CONFIG_KGDB) += ppc-stub.o obj-$(CONFIG_SMP) += smp.o smp-tbsync.o -ifndef CONFIG_E200 -obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o -endif obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o ifndef CONFIG_MATH_EMULATION @@ -33,7 +30,4 @@ endif else obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o obj-$(CONFIG_KGDB) += ppc-stub.o -ifndef CONFIG_E200 -obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o -endif endif