aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-27 04:09:04 -0500
committerPaul Mackerras <paulus@samba.org>2006-03-27 04:09:04 -0500
commit8b844dd7591a820a618a8fb33c9c43186d43d1b9 (patch)
tree4185cfc9b84e574a197b9371db44703af9380815 /arch
parented981856ca8af30912fd61a6a4ac8d30a453a5ec (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/Makefile1
-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/Makefile6
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
38obj-$(CONFIG_TAU) += tau_6xx.o 38obj-$(CONFIG_TAU) += tau_6xx.o
39obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o 39obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o
40obj32-$(CONFIG_MODULES) += module_32.o 40obj32-$(CONFIG_MODULES) += module_32.o
41obj-$(CONFIG_E500) += perfmon_fsl_booke.o
41 42
42ifeq ($(CONFIG_PPC_MERGE),y) 43ifeq ($(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
19obj-$(CONFIG_RAPIDIO) += rio.o 19obj-$(CONFIG_RAPIDIO) += rio.o
20obj-$(CONFIG_KGDB) += ppc-stub.o 20obj-$(CONFIG_KGDB) += ppc-stub.o
21obj-$(CONFIG_SMP) += smp.o smp-tbsync.o 21obj-$(CONFIG_SMP) += smp.o smp-tbsync.o
22ifndef CONFIG_E200
23obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o
24endif
25obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o 22obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
26 23
27ifndef CONFIG_MATH_EMULATION 24ifndef CONFIG_MATH_EMULATION
@@ -33,7 +30,4 @@ endif
33else 30else
34obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o 31obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
35obj-$(CONFIG_KGDB) += ppc-stub.o 32obj-$(CONFIG_KGDB) += ppc-stub.o
36ifndef CONFIG_E200
37obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o
38endif
39endif 33endif