diff options
| author | Scott Wood <scottwood@freescale.com> | 2008-01-31 11:36:56 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-02-05 23:29:58 -0600 |
| commit | 266fb4af93427923ee76bd9dc73ec352b8d791ab (patch) | |
| tree | d2b01b35fe478a94a8a3159a0ebdb63b0573c64e /arch/powerpc | |
| parent | b277b02588ec7534a033ff1cb0f947c18a4d3b54 (diff) | |
| download | kernel-crypto-266fb4af93427923ee76bd9dc73ec352b8d791ab.tar.gz kernel-crypto-266fb4af93427923ee76bd9dc73ec352b8d791ab.tar.xz kernel-crypto-266fb4af93427923ee76bd9dc73ec352b8d791ab.zip | |
[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')
| -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 c6bc0783c3b..82363e98f50 100644 --- a/arch/powerpc/platforms/8xx/adder875.c +++ b/arch/powerpc/platforms/8xx/adder875.c @@ -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, diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c index a8dffa00577..7d9ac6040d6 100644 --- a/arch/powerpc/platforms/8xx/ep88xc.c +++ b/arch/powerpc/platforms/8xx/ep88xc.c @@ -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" |