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

Commit b5677d84 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Kumar Gala
Browse files

[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c 



Rename commproc.[ch] to cpm1.[ch] to be more consistent with cpm2. Also
rename cpm2_common.c to cpm2.c as suggested by Scott Wood. Adjust the
includes accordingly.

Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 02753cb6

arch/powerpc/platforms/8xx/ep88xc.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/io.h>

#include <asm/udbg.h>

#include <asm/commproc.h>

#include <asm/cpm1.h>



#include "mpc8xx.h"

arch/powerpc/platforms/8xx/mpc86xads_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <asm/system.h>

#include <asm/time.h>

#include <asm/8xx_immap.h>

#include <asm/commproc.h>

#include <asm/cpm1.h>

#include <asm/fs_pd.h>

#include <asm/udbg.h>

arch/powerpc/platforms/8xx/mpc885ads_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <asm/time.h>

#include <asm/mpc8xx.h>

#include <asm/8xx_immap.h>

#include <asm/commproc.h>

#include <asm/cpm1.h>

#include <asm/fs_pd.h>

#include <asm/udbg.h>

arch/powerpc/sysdev/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ endif 
# Temporary hack until we have migrated to asm-powerpc

ifeq ($(ARCH),powerpc)

obj-$(CONFIG_CPM)		+= cpm_common.o

obj-$(CONFIG_CPM2)		+= cpm2_common.o cpm2_pic.o

obj-$(CONFIG_CPM2)		+= cpm2.o cpm2_pic.o

obj-$(CONFIG_PPC_DCR)		+= dcr.o

obj-$(CONFIG_8xx)		+= mpc8xx_pic.o commproc.o

obj-$(CONFIG_8xx)		+= mpc8xx_pic.o cpm1.o

obj-$(CONFIG_UCODE_PATCH)	+= micropatch.o

endif

arch/powerpc/sysdev/commproc.c→arch/powerpc/sysdev/cpm1.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/8xx_immap.h>

#include <asm/commproc.h>

#include <asm/cpm1.h>

#include <asm/io.h>

#include <asm/tlbflush.h>

#include <asm/rheap.h>