Merge branch 'master'

[sfrench/cifs-2.6.git] / arch / ppc / platforms / gemini_setup.c

diff --git a/arch/ppc/platforms/gemini_setup.c b/arch/ppc/platforms/gemini_setup.c
index 3a5ff9fb71d6e1cae9e8806cc2f63e3115e545c0..0090ff154608c39473b2d51366eaed607dd86eff 100644 (file)
--- a/arch/ppc/platforms/gemini_setup.c
+++ b/arch/ppc/platforms/gemini_setup.c
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/platforms/gemini_setup.c
- *
  *  Copyright (C) 1995 Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
@@ -35,6 +33,7 @@
 #include <asm/time.h>
 #include <asm/open_pic.h>
 #include <asm/bootinfo.h>
+#include <asm/machdep.h>
 
 void gemini_find_bridges(void);
 static int gemini_get_clock_speed(void);
@@ -555,7 +554,6 @@ void __init platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
        ppc_md.setup_arch = gemini_setup_arch;
        ppc_md.show_cpuinfo = gemini_show_cpuinfo;
-       ppc_md.irq_canonicalize = NULL;
        ppc_md.init_IRQ = gemini_init_IRQ;
        ppc_md.get_irq = openpic_get_irq;
        ppc_md.init = NULL;
@@ -575,6 +573,6 @@ void __init platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
        ppc_md.pcibios_fixup_bus = gemini_pcibios_fixup;
 
 #ifdef CONFIG_SMP
-       ppc_md.smp_ops = &gemini_smp_ops;
+       smp_ops = &gemini_smp_ops;
 #endif /* CONFIG_SMP */
 }