Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / arch / powerpc / platforms / 86xx / sbc8641d.c

diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index 510a06e..00e6fad 100644 (file)
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -37,29 +37,6 @@
 
 #include "mpc86xx.h"
 
-static void __init
-sbc8641_init_irq(void)
-{
-       struct mpic *mpic1;
-       struct device_node *np;
-       struct resource res;
-
-       /* Determine PIC address. */
-       np = of_find_node_by_type(NULL, "open-pic");
-       if (np == NULL)
-               return;
-       of_address_to_resource(np, 0, &res);
-
-       /* Alloc mpic structure and per isu has 16 INT entries. */
-       mpic1 = mpic_alloc(np, res.start,
-                       MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                       0, 256, " MPIC     ");
-       of_node_put(np);
-       BUG_ON(mpic1 == NULL);
-
-       mpic_init(mpic1);
-}
-
 static void __init
 sbc8641_setup_arch(void)
 {
@@ -151,7 +128,7 @@ define_machine(sbc8641) {
        .name                   = "SBC8641D",
        .probe                  = sbc8641_probe,
        .setup_arch             = sbc8641_setup_arch,
-       .init_IRQ               = sbc8641_init_irq,
+       .init_IRQ               = mpc86xx_init_irq,
        .show_cpuinfo           = sbc8641_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .restart                = fsl_rstcr_restart,