Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell...

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / iseries / setup.c

diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 5616219a20d5d3ee2d3f6484081378a19f1671ac..b72120751bbed16460b9f3c87c3e849b59228c2c 100644 (file)
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -639,24 +639,25 @@ static int __init iseries_probe(void)
 }
 
 define_machine(iseries) {
-       .name           = "iSeries",
-       .setup_arch     = iSeries_setup_arch,
-       .show_cpuinfo   = iSeries_show_cpuinfo,
-       .init_IRQ       = iSeries_init_IRQ,
-       .get_irq        = iSeries_get_irq,
-       .init_early     = iSeries_init_early,
-       .pcibios_fixup  = iSeries_pci_final_fixup,
-       .restart        = mf_reboot,
-       .power_off      = mf_power_off,
-       .halt           = mf_power_off,
-       .get_boot_time  = iSeries_get_boot_time,
-       .set_rtc_time   = iSeries_set_rtc_time,
-       .get_rtc_time   = iSeries_get_rtc_time,
-       .calibrate_decr = generic_calibrate_decr,
-       .progress       = iSeries_progress,
-       .probe          = iseries_probe,
-       .ioremap        = iseries_ioremap,
-       .iounmap        = iseries_iounmap,
+       .name                   = "iSeries",
+       .setup_arch             = iSeries_setup_arch,
+       .show_cpuinfo           = iSeries_show_cpuinfo,
+       .init_IRQ               = iSeries_init_IRQ,
+       .get_irq                = iSeries_get_irq,
+       .init_early             = iSeries_init_early,
+       .pcibios_fixup          = iSeries_pci_final_fixup,
+       .pcibios_fixup_resources= iSeries_pcibios_fixup_resources,
+       .restart                = mf_reboot,
+       .power_off              = mf_power_off,
+       .halt                   = mf_power_off,
+       .get_boot_time          = iSeries_get_boot_time,
+       .set_rtc_time           = iSeries_set_rtc_time,
+       .get_rtc_time           = iSeries_get_rtc_time,
+       .calibrate_decr         = generic_calibrate_decr,
+       .progress               = iSeries_progress,
+       .probe                  = iseries_probe,
+       .ioremap                = iseries_ioremap,
+       .iounmap                = iseries_iounmap,
        /* XXX Implement enable_pmcs for iSeries */
 };