Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25

1 files changed, 3 insertions, 3 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 @@
 
 #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,