diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-27 04:09:04 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-27 04:09:04 -0500 |
commit | 8b844dd7591a820a618a8fb33c9c43186d43d1b9 (patch) | |
tree | 4185cfc9b84e574a197b9371db44703af9380815 /arch | |
parent | ed981856ca8af30912fd61a6a4ac8d30a453a5ec (diff) |
powerpc: Move perfmon_fsl_booke.c over to arch/powerpc
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/perfmon_fsl_booke.c (renamed from arch/ppc/kernel/perfmon_fsl_booke.c) | 0 | ||||
-rw-r--r-- | arch/ppc/kernel/Makefile | 6 |
3 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index b86d380f01b4..0cc0995b81b0 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -38,6 +38,7 @@ obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o | |||
38 | obj-$(CONFIG_TAU) += tau_6xx.o | 38 | obj-$(CONFIG_TAU) += tau_6xx.o |
39 | obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o | 39 | obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o |
40 | obj32-$(CONFIG_MODULES) += module_32.o | 40 | obj32-$(CONFIG_MODULES) += module_32.o |
41 | obj-$(CONFIG_E500) += perfmon_fsl_booke.o | ||
41 | 42 | ||
42 | ifeq ($(CONFIG_PPC_MERGE),y) | 43 | ifeq ($(CONFIG_PPC_MERGE),y) |
43 | 44 | ||
diff --git a/arch/ppc/kernel/perfmon_fsl_booke.c b/arch/powerpc/kernel/perfmon_fsl_booke.c index 32455dfcc36b..32455dfcc36b 100644 --- a/arch/ppc/kernel/perfmon_fsl_booke.c +++ b/arch/powerpc/kernel/perfmon_fsl_booke.c | |||
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index e55d7ee17957..4b7a05655cf7 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile | |||
@@ -19,9 +19,6 @@ obj-$(CONFIG_PCI) += pci.o | |||
19 | obj-$(CONFIG_RAPIDIO) += rio.o | 19 | obj-$(CONFIG_RAPIDIO) += rio.o |
20 | obj-$(CONFIG_KGDB) += ppc-stub.o | 20 | obj-$(CONFIG_KGDB) += ppc-stub.o |
21 | obj-$(CONFIG_SMP) += smp.o smp-tbsync.o | 21 | obj-$(CONFIG_SMP) += smp.o smp-tbsync.o |
22 | ifndef CONFIG_E200 | ||
23 | obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o | ||
24 | endif | ||
25 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o | 22 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o |
26 | 23 | ||
27 | ifndef CONFIG_MATH_EMULATION | 24 | ifndef CONFIG_MATH_EMULATION |
@@ -33,7 +30,4 @@ endif | |||
33 | else | 30 | else |
34 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o | 31 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o |
35 | obj-$(CONFIG_KGDB) += ppc-stub.o | 32 | obj-$(CONFIG_KGDB) += ppc-stub.o |
36 | ifndef CONFIG_E200 | ||
37 | obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o | ||
38 | endif | ||
39 | endif | 33 | endif |