diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2005-11-03 20:12:52 -0500 |
---|---|---|
committer | Michael Ellerman <michael@ellerman.id.au> | 2005-11-03 20:12:52 -0500 |
commit | dc3a9efb5ee89493a42c3365d219e339e4720c2b (patch) | |
tree | a0d261c2933f3083f351c858b01de7677356d4b7 /arch/powerpc/platforms/pseries/setup.c | |
parent | 30415f6a63f3383a18e9adf7c144acabe6893f63 (diff) | |
parent | d3ab57ebdc6457543b346255fa47b0ecd7671136 (diff) |
Merge with Paulus
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index d54e1e4c7c63..65bee939eecc 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -602,9 +602,9 @@ struct machdep_calls __initdata pSeries_md = { | |||
602 | .pcibios_fixup = pSeries_final_fixup, | 602 | .pcibios_fixup = pSeries_final_fixup, |
603 | .pci_probe_mode = pSeries_pci_probe_mode, | 603 | .pci_probe_mode = pSeries_pci_probe_mode, |
604 | .irq_bus_setup = pSeries_irq_bus_setup, | 604 | .irq_bus_setup = pSeries_irq_bus_setup, |
605 | .restart = rtas_fw_restart, | 605 | .restart = rtas_restart, |
606 | .power_off = rtas_fw_power_off, | 606 | .power_off = rtas_power_off, |
607 | .halt = rtas_fw_halt, | 607 | .halt = rtas_halt, |
608 | .panic = rtas_os_term, | 608 | .panic = rtas_os_term, |
609 | .cpu_die = pSeries_mach_cpu_die, | 609 | .cpu_die = pSeries_mach_cpu_die, |
610 | .get_boot_time = rtas_get_boot_time, | 610 | .get_boot_time = rtas_get_boot_time, |