merge filename and modify references to iseries/hv_lp_event.h
[linux-2.6.git] / arch / powerpc / platforms / iseries / setup.c
index 41cd5b6..881d81f 100644 (file)
 #include <asm/cache.h>
 #include <asm/sections.h>
 #include <asm/abs_addr.h>
-#include <asm/iSeries/HvLpConfig.h>
-#include <asm/iSeries/HvCallEvent.h>
-#include <asm/iSeries/HvCallXm.h>
+#include <asm/iseries/hv_lp_config.h>
+#include <asm/iseries/hv_call_event.h>
+#include <asm/iseries/hv_call_xm.h>
 #include <asm/iSeries/ItLpQueue.h>
 #include <asm/iSeries/mf.h>
-#include <asm/iSeries/HvLpEvent.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iSeries/LparMap.h>
 
 #include "setup.h"
@@ -302,8 +302,6 @@ static void __init iSeries_get_cmdline(void)
 
 static void __init iSeries_init_early(void)
 {
-       extern unsigned long memory_limit;
-
        DBG(" -> iSeries_init_early()\n");
 
        ppc64_firmware_features = FW_FEATURE_ISERIES;
@@ -587,7 +585,7 @@ static void __init iSeries_setup_arch(void)
        printk("Processor version = %x\n", systemcfg->processor);
 }
 
-static void iSeries_get_cpuinfo(struct seq_file *m)
+static void iSeries_show_cpuinfo(struct seq_file *m)
 {
        seq_printf(m, "machine\t\t: 64-bit iSeries Logical Partition\n");
 }
@@ -760,7 +758,7 @@ static int __init iseries_probe(int platform)
 
 struct machdep_calls __initdata iseries_md = {
        .setup_arch     = iSeries_setup_arch,
-       .get_cpuinfo    = iSeries_get_cpuinfo,
+       .show_cpuinfo   = iSeries_show_cpuinfo,
        .init_IRQ       = iSeries_init_IRQ,
        .get_irq        = iSeries_get_irq,
        .init_early     = iSeries_init_early,