diff options
author | Scott Wood <scottwood@freescale.com> | 2008-01-31 12:36:56 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-02-06 00:29:58 -0500 |
commit | 266fb4af93427923ee76bd9dc73ec352b8d791ab (patch) | |
tree | d2b01b35fe478a94a8a3159a0ebdb63b0573c64e /arch/powerpc/platforms/8xx | |
parent | b277b02588ec7534a033ff1cb0f947c18a4d3b54 (diff) |
[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: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/8xx')
-rw-r--r-- | arch/powerpc/platforms/8xx/adder875.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/8xx/ep88xc.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/8xx/adder875.c b/arch/powerpc/platforms/8xx/adder875.c index c6bc0783c3b0..82363e98f50e 100644 --- a/arch/powerpc/platforms/8xx/adder875.c +++ b/arch/powerpc/platforms/8xx/adder875.c | |||
@@ -15,12 +15,12 @@ | |||
15 | 15 | ||
16 | #include <asm/time.h> | 16 | #include <asm/time.h> |
17 | #include <asm/machdep.h> | 17 | #include <asm/machdep.h> |
18 | #include <asm/commproc.h> | 18 | #include <asm/cpm1.h> |
19 | #include <asm/fs_pd.h> | 19 | #include <asm/fs_pd.h> |
20 | #include <asm/udbg.h> | 20 | #include <asm/udbg.h> |
21 | #include <asm/prom.h> | 21 | #include <asm/prom.h> |
22 | 22 | ||
23 | #include <sysdev/commproc.h> | 23 | #include "mpc8xx.h" |
24 | 24 | ||
25 | struct cpm_pin { | 25 | struct cpm_pin { |
26 | int port, pin, flags; | 26 | int port, pin, flags; |
@@ -108,7 +108,7 @@ define_machine(adder875) { | |||
108 | .name = "Adder MPC875", | 108 | .name = "Adder MPC875", |
109 | .probe = adder875_probe, | 109 | .probe = adder875_probe, |
110 | .setup_arch = adder875_setup, | 110 | .setup_arch = adder875_setup, |
111 | .init_IRQ = m8xx_pic_init, | 111 | .init_IRQ = mpc8xx_pics_init, |
112 | .get_irq = mpc8xx_get_irq, | 112 | .get_irq = mpc8xx_get_irq, |
113 | .restart = mpc8xx_restart, | 113 | .restart = mpc8xx_restart, |
114 | .calibrate_decr = generic_calibrate_decr, | 114 | .calibrate_decr = generic_calibrate_decr, |
diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c index a8dffa005775..7d9ac6040d63 100644 --- a/arch/powerpc/platforms/8xx/ep88xc.c +++ b/arch/powerpc/platforms/8xx/ep88xc.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <asm/machdep.h> | 15 | #include <asm/machdep.h> |
16 | #include <asm/io.h> | 16 | #include <asm/io.h> |
17 | #include <asm/udbg.h> | 17 | #include <asm/udbg.h> |
18 | #include <asm/commproc.h> | ||
19 | #include <asm/cpm1.h> | 18 | #include <asm/cpm1.h> |
20 | 19 | ||
21 | #include "mpc8xx.h" | 20 | #include "mpc8xx.h" |