This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc64 / kernel / iSeries_setup.c

diff --git a/arch/ppc64/kernel/iSeries_setup.c b/arch/ppc64/kernel/iSeries_setup.c
index 9ea357f..9b59f51 100644 (file)
--- a/arch/ppc64/kernel/iSeries_setup.c
+++ b/arch/ppc64/kernel/iSeries_setup.c
@@ -55,7 +55,6 @@
 #include <asm/iSeries/IoHriMainStore.h>
 #include <asm/iSeries/iSeries_proc.h>
 #include <asm/iSeries/mf.h>
-#include <asm/iSeries/HvLpEvent.h>
 
 extern void hvlog(char *fmt, ...);
 
@@ -733,7 +732,7 @@ void iSeries_restart(char *cmd)
  */
 void iSeries_power_off(void)
 {
-       mf_power_off();
+       mf_powerOff();
 }
 
 /*
@@ -741,7 +740,7 @@ void iSeries_power_off(void)
  */
 void iSeries_halt(void)
 {
-       mf_power_off();
+       mf_powerOff();
 }
 
 /* JDH Hack */
@@ -797,9 +796,9 @@ void __init iSeries_progress(char * st, unsigned short code)
        printk("Progress: [%04x] - %s\n", (unsigned)code, st);
        if (!piranha_simulator && mf_initialized) {
                if (code != 0xffff)
-                       mf_display_progress(code);
+                       mf_displayProgress(code);
                else
-                       mf_clear_src();
+                       mf_clearSrc();
        }
 }