Commit 0eb4cb9b authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Move l2cr.S over to arch/powerpc 



No functional changes, but call it l2cr_6xx.S since it is specific
to 6xx-family (including G3/750 and G4/74xx) processors.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent fbd7740f

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ obj-$(CONFIG_IBMEBUS) += ibmebus.o 
obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o

obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_6xx)		+= idle_6xx.o

obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o



ifeq ($(CONFIG_PPC_MERGE),y)

arch/ppc/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ extra-y += vmlinux.lds 
obj-y				:= entry.o traps.o time.o misc.o \

					setup.o \

					ppc_htab.o

obj-$(CONFIG_6xx)		+= l2cr.o cpu_setup_6xx.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
@@ -34,7 +34,7 @@ endif 
# These are here while we do the architecture merge



else

obj-$(CONFIG_6xx)		+= l2cr.o cpu_setup_6xx.o

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