Skip to contentSkip to conversation

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

PATCH Applied Scott Wood 2 participants 2 messages Jan 31, 2008 – Feb 6, 2008

Subsystems (2)
PowerPC Linux for PowerPC embedded PPC8XX and PPC83XX
lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH 1/1 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 Scott Wood <[email protected]>
---
 arch/powerpc/platforms/8xx/adder875.c |    6 +++---
 arch/powerpc/platforms/8xx/ep88xc.c   |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)
arch/powerpc/platforms/8xx/adder875.c +3 -3
index c6bc078..82363e9 100644
@@ -15,12 +15,12 @@
 
 #include <asm/time.h>
 #include <asm/machdep.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 #include <asm/fs_pd.h>
 #include <asm/udbg.h>
 #include <asm/prom.h>
 
-#include <sysdev/commproc.h>
+#include "mpc8xx.h"
 
 struct cpm_pin {
 	int port, pin, flags;

@@ -108,7 +108,7 @@ define_machine(adder875) {
 	.name = "Adder MPC875",
 	.probe = adder875_probe,
 	.setup_arch = adder875_setup,
-	.init_IRQ = m8xx_pic_init,
+	.init_IRQ = mpc8xx_pics_init,
 	.get_irq = mpc8xx_get_irq,
 	.restart = mpc8xx_restart,
 	.calibrate_decr = generic_calibrate_decr,
arch/powerpc/platforms/8xx/ep88xc.c +0 -1
index a8dffa0..7d9ac60 100644
@@ -15,7 +15,6 @@
 #include <asm/machdep.h>
 #include <asm/io.h>
 #include <asm/udbg.h>
-#include <asm/commproc.h>
 #include <asm/cpm1.h>
 
 #include "mpc8xx.h"
Signature · 1 line
1.5.3.8
Applied
#1 lore raw
Quoted 9 lines · Scott Wood

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 Scott Wood <[email protected]>

---

arch/powerpc/platforms/8xx/adder875.c |    6 +++---
arch/powerpc/platforms/8xx/ep88xc.c   |    1 -
2 files changed, 3 insertions(+), 4 deletions(-)

applied.

- k