powerpc/chrp: Move PHB discovery

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / chrp / setup.c

diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index c45435aa5e36f4bf8e69684e3a5c6d5823d6c89d..3cfc382841e52522fd15a0cc00a758aadab38e84 100644 (file)
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -334,22 +334,11 @@ static void __init chrp_setup_arch(void)
        /* On pegasos, enable the L2 cache if not already done by OF */
        pegasos_set_l2cr();
 
-       /* Lookup PCI host bridges */
-       chrp_find_bridges();
-
-       /*
-        *  Temporary fixes for PCI devices.
-        *  -- Geert
-        */
-       hydra_init();           /* Mac I/O */
-
        /*
         *  Fix the Super I/O configuration
         */
        sio_init();
 
-       pci_create_OF_bus_map();
-
        /*
         * Print the banner, then scroll down so boot progress
         * can be printed.  -- Cort
@@ -582,6 +571,7 @@ define_machine(chrp) {
        .name                   = "CHRP",
        .probe                  = chrp_probe,
        .setup_arch             = chrp_setup_arch,
+       .discover_phbs          = chrp_find_bridges,
        .init                   = chrp_init2,
        .show_cpuinfo           = chrp_show_cpuinfo,
        .init_IRQ               = chrp_init_IRQ,