diff options
| author | Paul Mackerras | 2005-11-03 04:41:19 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2005-11-03 04:41:19 +0100 |
| commit | f4fcbbe9a7fdf11305fea657202b954bdc2228ec (patch) | |
| tree | d3f6a54b82b6d28f7e78cebd8043df2d9b596b5a /arch/powerpc/platforms/pseries/setup.c | |
| parent | powerpc: Compile fixes for chrp/nvram.c (diff) | |
| download | kernel-qcow2-linux-f4fcbbe9a7fdf11305fea657202b954bdc2228ec.tar.gz kernel-qcow2-linux-f4fcbbe9a7fdf11305fea657202b954bdc2228ec.tar.xz kernel-qcow2-linux-f4fcbbe9a7fdf11305fea657202b954bdc2228ec.zip | |
powerpc: Merge remaining RTAS code
This moves rtas-proc.c and rtas_flash.c into arch/powerpc/kernel, since
cell wants them as well as pseries (and chrp can use rtas-proc.c too,
at least in principle). rtas_fw.c is gone, with its bits moved into
rtas_flash.c and rtas.c.
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 c0a3d918148a..f73d69143d35 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -589,9 +589,9 @@ struct machdep_calls __initdata pSeries_md = { .pcibios_fixup = pSeries_final_fixup, .pci_probe_mode = pSeries_pci_probe_mode, .irq_bus_setup = pSeries_irq_bus_setup, - .restart = rtas_fw_restart, - .power_off = rtas_fw_power_off, - .halt = rtas_fw_halt, + .restart = rtas_restart, + .power_off = rtas_power_off, + .halt = rtas_halt, .panic = rtas_os_term, .cpu_die = pSeries_mach_cpu_die, .get_boot_time = rtas_get_boot_time, |