diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 23:44:02 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 23:44:02 +0300 |
| commit | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch) | |
| tree | 41758e4da78f94a20813554ef9f5ed9b323a4f8c /arch/ppc/platforms/gemini_setup.c | |
| parent | cd8200e6d4f9f05e6ea48f7c000be890337396ac (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | linux-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'arch/ppc/platforms/gemini_setup.c')
| -rw-r--r-- | arch/ppc/platforms/gemini_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/gemini_setup.c b/arch/ppc/platforms/gemini_setup.c index 3a5ff9fb71d6..729897c59033 100644 --- a/arch/ppc/platforms/gemini_setup.c +++ b/arch/ppc/platforms/gemini_setup.c @@ -35,6 +35,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 +556,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 +575,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 */ } |