#include <asm/time.h>
#include <asm/uic.h>
#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
-#include "44x.h"
-
-static struct of_device_id taishan_of_bus[] = {
+static __initdata struct of_device_id taishan_of_bus[] = {
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
static int __init taishan_device_probe(void)
{
- if (!machine_is(taishan))
- return 0;
-
of_platform_bus_probe(NULL, taishan_of_bus, NULL);
return 0;
}
-device_initcall(taishan_device_probe);
+machine_device_initcall(taishan, taishan_device_probe);
/*
* Called very early, MMU is off, device-tree isn't unflattened
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
- .restart = ppc44x_reset_system,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};