Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b844dd7 authored Mar 27, 2006 by Paul Mackerras

powerpc: Move perfmon_fsl_booke.c over to arch/powerpc



Signed-off-by: Paul Mackerras <paulus@samba.org>

parent ed981856

arch/powerpc/kernel/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)

arch/ppc/kernel/perfmon_fsl_booke.c→arch/powerpc/kernel/perfmon_fsl_booke.c

+0 −0

File moved.

arch/ppc/kernel/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -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