diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-01-18 12:37:07 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-02-07 08:30:22 -0500 |
commit | fcdb27ad1d5c66611d3df6400a9b559186f266fe (patch) | |
tree | 96560c96bb962a63ed7dd3f56d50b4a8ae41f035 /arch/mips/gt64120 | |
parent | 9414d3628abb646834965b6c23b8e9064729b110 (diff) |
[MIPS] Rename _machine_power_off to pm_power_off so the kernel builds again.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/gt64120')
-rw-r--r-- | arch/mips/gt64120/ev64120/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/gt64120/momenco_ocelot/setup.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/mips/gt64120/ev64120/setup.c b/arch/mips/gt64120/ev64120/setup.c index 98b5a96cc039..6d859d1e7a2d 100644 --- a/arch/mips/gt64120/ev64120/setup.c +++ b/arch/mips/gt64120/ev64120/setup.c | |||
@@ -34,6 +34,8 @@ | |||
34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
35 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
36 | #include <linux/timex.h> | 36 | #include <linux/timex.h> |
37 | #include <linux/pm.h> | ||
38 | |||
37 | #include <asm/bootinfo.h> | 39 | #include <asm/bootinfo.h> |
38 | #include <asm/page.h> | 40 | #include <asm/page.h> |
39 | #include <asm/io.h> | 41 | #include <asm/io.h> |
@@ -73,7 +75,7 @@ void __init plat_setup(void) | |||
73 | { | 75 | { |
74 | _machine_restart = galileo_machine_restart; | 76 | _machine_restart = galileo_machine_restart; |
75 | _machine_halt = galileo_machine_halt; | 77 | _machine_halt = galileo_machine_halt; |
76 | _machine_power_off = galileo_machine_power_off; | 78 | pm_power_off = galileo_machine_power_off; |
77 | 79 | ||
78 | board_time_init = gt64120_time_init; | 80 | board_time_init = gt64120_time_init; |
79 | set_io_port_base(KSEG1); | 81 | set_io_port_base(KSEG1); |
diff --git a/arch/mips/gt64120/momenco_ocelot/setup.c b/arch/mips/gt64120/momenco_ocelot/setup.c index 0d07c33112d0..20b65d3d2151 100644 --- a/arch/mips/gt64120/momenco_ocelot/setup.c +++ b/arch/mips/gt64120/momenco_ocelot/setup.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * BRIEF MODULE DESCRIPTION | 4 | * BRIEF MODULE DESCRIPTION |
5 | * Momentum Computer Ocelot (CP7000) - board dependent boot routines | 5 | * Momentum Computer Ocelot (CP7000) - board dependent boot routines |
6 | * | 6 | * |
7 | * Copyright (C) 1996, 1997, 2001 Ralf Baechle | 7 | * Copyright (C) 1996, 1997, 2001, 06 Ralf Baechle (ralf@linux-mips.org) |
8 | * Copyright (C) 2000 RidgeRun, Inc. | 8 | * Copyright (C) 2000 RidgeRun, Inc. |
9 | * Copyright (C) 2001 Red Hat, Inc. | 9 | * Copyright (C) 2001 Red Hat, Inc. |
10 | * Copyright (C) 2002 Momentum Computer | 10 | * Copyright (C) 2002 Momentum Computer |
@@ -47,6 +47,8 @@ | |||
47 | #include <linux/pci.h> | 47 | #include <linux/pci.h> |
48 | #include <linux/timex.h> | 48 | #include <linux/timex.h> |
49 | #include <linux/vmalloc.h> | 49 | #include <linux/vmalloc.h> |
50 | #include <linux/pm.h> | ||
51 | |||
50 | #include <asm/time.h> | 52 | #include <asm/time.h> |
51 | #include <asm/bootinfo.h> | 53 | #include <asm/bootinfo.h> |
52 | #include <asm/page.h> | 54 | #include <asm/page.h> |
@@ -159,7 +161,7 @@ void __init plat_setup(void) | |||
159 | 161 | ||
160 | _machine_restart = momenco_ocelot_restart; | 162 | _machine_restart = momenco_ocelot_restart; |
161 | _machine_halt = momenco_ocelot_halt; | 163 | _machine_halt = momenco_ocelot_halt; |
162 | _machine_power_off = momenco_ocelot_power_off; | 164 | pm_power_off = momenco_ocelot_power_off; |
163 | 165 | ||
164 | /* | 166 | /* |
165 | * initrd_start = (ulong)ocelot_initrd_start; | 167 | * initrd_start = (ulong)ocelot_initrd_start; |