summaryrefslogtreecommitdiff
path: root/arch/ppc/kernel/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-27 19:15:26 +1100
committerPaul Mackerras <paulus@samba.org>2006-03-27 19:15:26 +1100
commit9b781727fd1062671afa144b93e8c69b14bcac4d (patch)
tree1cec35f0cedc664394b15165d96944019b8e1ff2 /arch/ppc/kernel/Makefile
parent0eb4cb9b16aba6d610a0716503b96d299b308d44 (diff)
powerpc: Move cpu_setup_6xx.S and temp.c over to arch/powerpc
Also renamed temp.c to tau_6xx.c (for thermal assist unit) and updated the Kconfig option description and help text for CONFIG_TAU. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/kernel/Makefile')
-rw-r--r--arch/ppc/kernel/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 3d50a2686839..d6a4863d4e7c 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -13,7 +13,6 @@ extra-y += vmlinux.lds
obj-y := entry.o traps.o time.o misc.o \
setup.o \
ppc_htab.o
-obj-$(CONFIG_6xx) += cpu_setup_6xx.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o
obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
@@ -21,7 +20,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
-obj-$(CONFIG_TAU) += temp.o
ifndef CONFIG_E200
obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o
endif
@@ -34,12 +32,10 @@ endif
# These are here while we do the architecture merge
else
-obj-$(CONFIG_6xx) += cpu_setup_6xx.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
obj-$(CONFIG_KGDB) += ppc-stub.o
-obj-$(CONFIG_TAU) += temp.o
ifndef CONFIG_E200
obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o
endif