[POWERPC] 8xx: Rename m8xx_pic_init to mpc8xx_pics_init

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 8xx / ep88xc.c

diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c
index c518b6cc5fab41a3d41f0bf60202bea4c377d9e7..372b1e2921e7b7943414a1fa0aebd362e409b81b 100644 (file)
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -155,18 +155,17 @@ static struct of_device_id __initdata of_bus_ids[] = {
 static int __init declare_of_platform_devices(void)
 {
        /* Publish the QE devices */
-       if (machine_is(ep88xc))
-               of_platform_bus_probe(NULL, of_bus_ids, NULL);
+       of_platform_bus_probe(NULL, of_bus_ids, NULL);
 
        return 0;
 }
-device_initcall(declare_of_platform_devices);
+machine_device_initcall(ep88xc, declare_of_platform_devices);
 
 define_machine(ep88xc) {
        .name = "Embedded Planet EP88xC",
        .probe = ep88xc_probe,
        .setup_arch = ep88xc_setup_arch,
-       .init_IRQ = m8xx_pic_init,
+       .init_IRQ = mpc8xx_pics_init,
        .get_irq        = mpc8xx_get_irq,
        .restart = mpc8xx_restart,
        .calibrate_decr = mpc8xx_calibrate_decr,