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

Commit 266fb4af authored by Scott Wood's avatar Scott Wood Committed by Kumar Gala
Browse files

[POWERPC] 8xx: adder875, ep88xc: fix to match recent 8xx cleanups. 



asm/commproc.h was renamed to asm/cpm1.h
sysdev/commproc.h was renamed to platforms/8xx/mpc8xx.h
m8xx_pic_init was renamed to mpc8xx_pics_init

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent b277b025

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -15,12 +15,12 @@ 




#include <asm/time.h>

#include <asm/time.h>

#include <asm/machdep.h>

#include <asm/machdep.h>

#include <asm/commproc.h>

#include <asm/cpm1.h>

#include <asm/fs_pd.h>

#include <asm/fs_pd.h>

#include <asm/udbg.h>

#include <asm/udbg.h>

#include <asm/prom.h>

#include <asm/prom.h>





#include <sysdev/commproc.h>

#include "mpc8xx.h"





struct cpm_pin {

struct cpm_pin {

	int port, pin, flags;

	int port, pin, flags;
@@ -108,7 +108,7 @@ define_machine(adder875) { 
	.name = "Adder MPC875",

	.name = "Adder MPC875",

	.probe = adder875_probe,

	.probe = adder875_probe,

	.setup_arch = adder875_setup,

	.setup_arch = adder875_setup,

	.init_IRQ = m8xx_pic_init,

	.init_IRQ = mpc8xx_pics_init,

	.get_irq = mpc8xx_get_irq,

	.get_irq = mpc8xx_get_irq,

	.restart = mpc8xx_restart,

	.restart = mpc8xx_restart,

	.calibrate_decr = generic_calibrate_decr,

	.calibrate_decr = generic_calibrate_decr,

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

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

#include <asm/machdep.h>

#include <asm/io.h>

#include <asm/io.h>

#include <asm/udbg.h>

#include <asm/udbg.h>

#include <asm/commproc.h>

#include <asm/cpm1.h>

#include <asm/cpm1.h>





#include "mpc8xx.h"

#include "mpc8xx.h"