tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[MIPS] Rename _machine_power_off to pm_power_off so the kernel builds again. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+79
-40
+2
-1
arch/mips/au1000/common/setup.c
+2
-1
arch/mips/au1000/common/setup.c
···
33
33
#include <linux/delay.h>
34
34
#include <linux/interrupt.h>
35
35
#include <linux/module.h>
36
+
#include <linux/pm.h>
36
37
37
38
#include <asm/cpu.h>
38
39
#include <asm/bootinfo.h>
···
126
125
#endif
127
126
_machine_restart = au1000_restart;
128
127
_machine_halt = au1000_halt;
129
-
_machine_power_off = au1000_power_off;
128
+
pm_power_off = au1000_power_off;
130
129
board_time_init = au1xxx_time_init;
131
130
board_timer_setup = au1xxx_timer_setup;
132
131
+3
-2
arch/mips/cobalt/setup.c
+3
-2
arch/mips/cobalt/setup.c
···
5
5
* License. See the file "COPYING" in the main directory of this archive
6
6
* for more details.
7
7
*
8
-
* Copyright (C) 1996, 1997, 2004 by Ralf Baechle (ralf@linux-mips.org)
8
+
* Copyright (C) 1996, 1997, 2004, 05 by Ralf Baechle (ralf@linux-mips.org)
9
9
* Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
10
10
*
11
11
*/
···
13
13
#include <linux/interrupt.h>
14
14
#include <linux/pci.h>
15
15
#include <linux/init.h>
16
+
#include <linux/pm.h>
16
17
#include <linux/serial.h>
17
18
#include <linux/serial_core.h>
18
19
···
100
99
101
100
_machine_restart = cobalt_machine_restart;
102
101
_machine_halt = cobalt_machine_halt;
103
-
_machine_power_off = cobalt_machine_power_off;
102
+
pm_power_off = cobalt_machine_power_off;
104
103
105
104
board_timer_setup = cobalt_timer_setup;
106
105
+2
-1
arch/mips/ddb5xxx/ddb5074/setup.c
+2
-1
arch/mips/ddb5xxx/ddb5074/setup.c
···
14
14
#include <linux/ide.h>
15
15
#include <linux/ioport.h>
16
16
#include <linux/irq.h>
17
+
#include <linux/pm.h>
17
18
18
19
#include <asm/addrspace.h>
19
20
#include <asm/bcache.h>
···
96
95
97
96
_machine_restart = ddb_machine_restart;
98
97
_machine_halt = ddb_machine_halt;
99
-
_machine_power_off = ddb_machine_power_off;
98
+
pm_power_off = ddb_machine_power_off;
100
99
101
100
ddb_out32(DDB_BAR0, 0);
102
101
+2
-1
arch/mips/ddb5xxx/ddb5476/setup.c
+2
-1
arch/mips/ddb5xxx/ddb5476/setup.c
···
11
11
#include <linux/types.h>
12
12
#include <linux/sched.h>
13
13
#include <linux/pci.h>
14
+
#include <linux/pm.h>
14
15
15
16
#include <asm/addrspace.h>
16
17
#include <asm/bcache.h>
···
134
133
135
134
_machine_restart = ddb_machine_restart;
136
135
_machine_halt = ddb_machine_halt;
137
-
_machine_power_off = ddb_machine_power_off;
136
+
pm_power_off = ddb_machine_power_off;
138
137
139
138
/* request io port/mem resources */
140
139
if (request_resource(&ioport_resource, &ddb5476_ioport.dma1) ||
+2
-1
arch/mips/ddb5xxx/ddb5477/setup.c
+2
-1
arch/mips/ddb5xxx/ddb5477/setup.c
···
26
26
#include <linux/major.h>
27
27
#include <linux/kdev_t.h>
28
28
#include <linux/root_dev.h>
29
+
#include <linux/pm.h>
29
30
30
31
#include <asm/cpu.h>
31
32
#include <asm/bootinfo.h>
···
183
182
184
183
_machine_restart = ddb_machine_restart;
185
184
_machine_halt = ddb_machine_halt;
186
-
_machine_power_off = ddb_machine_power_off;
185
+
pm_power_off = ddb_machine_power_off;
187
186
188
187
/* setup resource limits */
189
188
ioport_resource.end = DDB_PCI0_IO_SIZE + DDB_PCI1_IO_SIZE - 1;
+2
-1
arch/mips/dec/setup.c
+2
-1
arch/mips/dec/setup.c
···
17
17
#include <linux/sched.h>
18
18
#include <linux/spinlock.h>
19
19
#include <linux/types.h>
20
+
#include <linux/pm.h>
20
21
21
22
#include <asm/bootinfo.h>
22
23
#include <asm/cpu.h>
···
159
158
160
159
_machine_restart = dec_machine_restart;
161
160
_machine_halt = dec_machine_halt;
162
-
_machine_power_off = dec_machine_power_off;
161
+
pm_power_off = dec_machine_power_off;
163
162
164
163
ioport_resource.start = ~0UL;
165
164
ioport_resource.end = 0UL;
+3
-1
arch/mips/gt64120/ev64120/setup.c
+3
-1
arch/mips/gt64120/ev64120/setup.c
···
34
34
#include <linux/interrupt.h>
35
35
#include <linux/pci.h>
36
36
#include <linux/timex.h>
37
+
#include <linux/pm.h>
38
+
37
39
#include <asm/bootinfo.h>
38
40
#include <asm/page.h>
39
41
#include <asm/io.h>
···
75
73
{
76
74
_machine_restart = galileo_machine_restart;
77
75
_machine_halt = galileo_machine_halt;
78
-
_machine_power_off = galileo_machine_power_off;
76
+
pm_power_off = galileo_machine_power_off;
79
77
80
78
board_time_init = gt64120_time_init;
81
79
set_io_port_base(KSEG1);
+4
-2
arch/mips/gt64120/momenco_ocelot/setup.c
+4
-2
arch/mips/gt64120/momenco_ocelot/setup.c
···
4
4
* BRIEF MODULE DESCRIPTION
5
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
8
* Copyright (C) 2000 RidgeRun, Inc.
9
9
* Copyright (C) 2001 Red Hat, Inc.
10
10
* Copyright (C) 2002 Momentum Computer
···
47
47
#include <linux/pci.h>
48
48
#include <linux/timex.h>
49
49
#include <linux/vmalloc.h>
50
+
#include <linux/pm.h>
51
+
50
52
#include <asm/time.h>
51
53
#include <asm/bootinfo.h>
52
54
#include <asm/page.h>
···
161
159
162
160
_machine_restart = momenco_ocelot_restart;
163
161
_machine_halt = momenco_ocelot_halt;
164
-
_machine_power_off = momenco_ocelot_power_off;
162
+
pm_power_off = momenco_ocelot_power_off;
165
163
166
164
/*
167
165
* initrd_start = (ulong)ocelot_initrd_start;
+2
-1
arch/mips/ite-boards/generic/it8172_setup.c
+2
-1
arch/mips/ite-boards/generic/it8172_setup.c
···
34
34
#include <linux/major.h>
35
35
#include <linux/kdev_t.h>
36
36
#include <linux/root_dev.h>
37
+
#include <linux/pm.h>
37
38
38
39
#include <asm/cpu.h>
39
40
#include <asm/time.h>
···
126
125
127
126
_machine_restart = it8172_restart;
128
127
_machine_halt = it8172_halt;
129
-
_machine_power_off = it8172_power_off;
128
+
pm_power_off = it8172_power_off;
130
129
131
130
/*
132
131
* IO/MEM resources.
+3
-1
arch/mips/jazz/setup.c
+3
-1
arch/mips/jazz/setup.c
···
19
19
#include <linux/console.h>
20
20
#include <linux/fb.h>
21
21
#include <linux/ide.h>
22
+
#include <linux/pm.h>
23
+
22
24
#include <asm/bootinfo.h>
23
25
#include <asm/irq.h>
24
26
#include <asm/jazz.h>
···
81
79
82
80
_machine_restart = jazz_machine_restart;
83
81
_machine_halt = jazz_machine_halt;
84
-
_machine_power_off = jazz_machine_power_off;
82
+
pm_power_off = jazz_machine_power_off;
85
83
86
84
#warning "Somebody should check if screen_info is ok for Jazz."
87
85
+2
-1
arch/mips/jmr3927/rbhma3100/setup.c
+2
-1
arch/mips/jmr3927/rbhma3100/setup.c
···
44
44
#include <linux/ioport.h>
45
45
#include <linux/param.h> /* for HZ */
46
46
#include <linux/delay.h>
47
+
#include <linux/pm.h>
47
48
#ifdef CONFIG_SERIAL_TXX9
48
49
#include <linux/tty.h>
49
50
#include <linux/serial.h>
···
212
211
213
212
_machine_restart = jmr3927_machine_restart;
214
213
_machine_halt = jmr3927_machine_halt;
215
-
_machine_power_off = jmr3927_machine_power_off;
214
+
pm_power_off = jmr3927_machine_power_off;
216
215
217
216
/*
218
217
* IO/MEM resources.
+6
-4
arch/mips/kernel/reset.c
+6
-4
arch/mips/kernel/reset.c
···
3
3
* License. See the file "COPYING" in the main directory of this archive
4
4
* for more details.
5
5
*
6
-
* Copyright (C) 2001 by Ralf Baechle
6
+
* Copyright (C) 2001, 06 by Ralf Baechle (ralf@linux-mips.org)
7
7
* Copyright (C) 2001 MIPS Technologies, Inc.
8
8
*/
9
9
#include <linux/kernel.h>
10
10
#include <linux/module.h>
11
+
#include <linux/pm.h>
11
12
#include <linux/types.h>
12
13
#include <linux/reboot.h>
14
+
13
15
#include <asm/reboot.h>
14
16
15
17
/*
···
21
19
*/
22
20
void (*_machine_restart)(char *command);
23
21
void (*_machine_halt)(void);
24
-
void (*_machine_power_off)(void);
22
+
void (*pm_power_off)(void);
25
23
26
24
void machine_restart(char *command)
27
25
{
···
37
35
38
36
void machine_power_off(void)
39
37
{
40
-
if (_machine_power_off)
41
-
_machine_power_off();
38
+
if (pm_power_off)
39
+
pm_power_off();
42
40
}
+4
-1
arch/mips/lasat/reset.c
+4
-1
arch/mips/lasat/reset.c
···
19
19
*/
20
20
#include <linux/config.h>
21
21
#include <linux/kernel.h>
22
+
#include <linux/pm.h>
23
+
22
24
#include <asm/reboot.h>
23
25
#include <asm/system.h>
24
26
#include <asm/lasat/lasat.h>
27
+
25
28
#include "picvue.h"
26
29
#include "prom.h"
27
30
···
66
63
{
67
64
_machine_restart = lasat_machine_restart;
68
65
_machine_halt = lasat_machine_halt;
69
-
_machine_power_off = lasat_machine_halt;
66
+
pm_power_off = lasat_machine_halt;
70
67
}
+3
-2
arch/mips/mips-boards/generic/reset.c
+3
-2
arch/mips/mips-boards/generic/reset.c
···
23
23
*
24
24
*/
25
25
#include <linux/config.h>
26
+
#include <linux/pm.h>
26
27
27
28
#include <asm/io.h>
28
29
#include <asm/reboot.h>
···
66
65
_machine_restart = mips_machine_restart;
67
66
_machine_halt = mips_machine_halt;
68
67
#if defined(CONFIG_MIPS_ATLAS)
69
-
_machine_power_off = atlas_machine_power_off;
68
+
pm_power_off = atlas_machine_power_off;
70
69
#endif
71
70
#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_SEAD)
72
-
_machine_power_off = mips_machine_halt;
71
+
pm_power_off = mips_machine_halt;
73
72
#endif
74
73
}
+2
-1
arch/mips/momentum/jaguar_atx/setup.c
+2
-1
arch/mips/momentum/jaguar_atx/setup.c
···
50
50
#include <linux/pci.h>
51
51
#include <linux/swap.h>
52
52
#include <linux/ioport.h>
53
+
#include <linux/pm.h>
53
54
#include <linux/sched.h>
54
55
#include <linux/interrupt.h>
55
56
#include <linux/timex.h>
···
366
365
367
366
_machine_restart = momenco_jaguar_restart;
368
367
_machine_halt = momenco_jaguar_halt;
369
-
_machine_power_off = momenco_jaguar_power_off;
368
+
pm_power_off = momenco_jaguar_power_off;
370
369
371
370
/*
372
371
* initrd_start = (ulong)jaguar_initrd_start;
+3
-1
arch/mips/momentum/ocelot_3/setup.c
+3
-1
arch/mips/momentum/ocelot_3/setup.c
···
57
57
#include <linux/timex.h>
58
58
#include <linux/bootmem.h>
59
59
#include <linux/mv643xx.h>
60
+
#include <linux/pm.h>
61
+
60
62
#include <asm/time.h>
61
63
#include <asm/page.h>
62
64
#include <asm/bootinfo.h>
···
323
321
324
322
_machine_restart = momenco_ocelot_restart;
325
323
_machine_halt = momenco_ocelot_halt;
326
-
_machine_power_off = momenco_ocelot_power_off;
324
+
pm_power_off = momenco_ocelot_power_off;
327
325
328
326
/* Wired TLB entries */
329
327
setup_wired_tlb_entries();
+3
-1
arch/mips/momentum/ocelot_c/setup.c
+3
-1
arch/mips/momentum/ocelot_c/setup.c
···
51
51
#include <linux/sched.h>
52
52
#include <linux/interrupt.h>
53
53
#include <linux/pci.h>
54
+
#include <linux/pm.h>
54
55
#include <linux/timex.h>
55
56
#include <linux/vmalloc.h>
57
+
56
58
#include <asm/time.h>
57
59
#include <asm/bootinfo.h>
58
60
#include <asm/page.h>
···
238
236
239
237
_machine_restart = momenco_ocelot_restart;
240
238
_machine_halt = momenco_ocelot_halt;
241
-
_machine_power_off = momenco_ocelot_power_off;
239
+
pm_power_off = momenco_ocelot_power_off;
242
240
243
241
/*
244
242
* initrd_start = (ulong)ocelot_initrd_start;
+3
-1
arch/mips/momentum/ocelot_g/setup.c
+3
-1
arch/mips/momentum/ocelot_g/setup.c
···
47
47
#include <linux/sched.h>
48
48
#include <linux/interrupt.h>
49
49
#include <linux/pci.h>
50
+
#include <linux/pm.h>
50
51
#include <linux/timex.h>
51
52
#include <linux/vmalloc.h>
53
+
52
54
#include <asm/time.h>
53
55
#include <asm/bootinfo.h>
54
56
#include <asm/page.h>
···
171
169
172
170
_machine_restart = momenco_ocelot_restart;
173
171
_machine_halt = momenco_ocelot_halt;
174
-
_machine_power_off = momenco_ocelot_power_off;
172
+
pm_power_off = momenco_ocelot_power_off;
175
173
176
174
/*
177
175
* initrd_start = (ulong)ocelot_initrd_start;
+2
-1
arch/mips/philips/pnx8550/common/setup.c
+2
-1
arch/mips/philips/pnx8550/common/setup.c
···
25
25
#include <linux/delay.h>
26
26
#include <linux/interrupt.h>
27
27
#include <linux/serial_ip3106.h>
28
+
#include <linux/pm.h>
28
29
29
30
#include <asm/cpu.h>
30
31
#include <asm/bootinfo.h>
···
91
90
92
91
_machine_restart = pnx8550_machine_restart;
93
92
_machine_halt = pnx8550_machine_halt;
94
-
_machine_power_off = pnx8550_machine_power_off;
93
+
pm_power_off = pnx8550_machine_power_off;
95
94
96
95
board_time_init = pnx8550_time_init;
97
96
board_timer_setup = pnx8550_timer_setup;
+2
-1
arch/mips/pmc-sierra/yosemite/prom.c
+2
-1
arch/mips/pmc-sierra/yosemite/prom.c
···
13
13
#include <linux/sched.h>
14
14
#include <linux/mm.h>
15
15
#include <linux/delay.h>
16
+
#include <linux/pm.h>
16
17
#include <linux/smp.h>
17
18
18
19
#include <asm/io.h>
···
93
92
/* Callbacks for halt, restart */
94
93
_machine_restart = (void (*)(char *)) prom_exit;
95
94
_machine_halt = prom_halt;
96
-
_machine_power_off = prom_halt;
95
+
pm_power_off = prom_halt;
97
96
98
97
debug_vectors = cv;
99
98
arcs_cmdline[0] = '\0';
+3
-2
arch/mips/sgi-ip22/ip22-reset.c
+3
-2
arch/mips/sgi-ip22/ip22-reset.c
···
3
3
* License. See the file "COPYING" in the main directory of this archive
4
4
* for more details.
5
5
*
6
-
* Copyright (C) 1997, 1998, 2001, 03, 05 by Ralf Baechle
6
+
* Copyright (C) 1997, 1998, 2001, 03, 05, 06 by Ralf Baechle
7
7
*/
8
8
#include <linux/linkage.h>
9
9
#include <linux/init.h>
···
13
13
#include <linux/kernel.h>
14
14
#include <linux/sched.h>
15
15
#include <linux/notifier.h>
16
+
#include <linux/pm.h>
16
17
#include <linux/timer.h>
17
18
18
19
#include <asm/io.h>
···
233
232
{
234
233
_machine_restart = sgi_machine_restart;
235
234
_machine_halt = sgi_machine_halt;
236
-
_machine_power_off = sgi_machine_power_off;
235
+
pm_power_off = sgi_machine_power_off;
237
236
238
237
request_irq(SGI_PANEL_IRQ, panel_int, 0, "Front Panel", NULL);
239
238
init_timer(&blink_timer);
+3
-2
arch/mips/sgi-ip27/ip27-reset.c
+3
-2
arch/mips/sgi-ip27/ip27-reset.c
···
5
5
*
6
6
* Reset an IP27.
7
7
*
8
-
* Copyright (C) 1997, 1998, 1999, 2000 by Ralf Baechle
8
+
* Copyright (C) 1997, 1998, 1999, 2000, 06 by Ralf Baechle
9
9
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
10
10
*/
11
11
#include <linux/config.h>
···
15
15
#include <linux/smp.h>
16
16
#include <linux/mmzone.h>
17
17
#include <linux/nodemask.h>
18
+
#include <linux/pm.h>
18
19
19
20
#include <asm/io.h>
20
21
#include <asm/irq.h>
···
78
77
{
79
78
_machine_restart = ip27_machine_restart;
80
79
_machine_halt = ip27_machine_halt;
81
-
_machine_power_off = ip27_machine_power_off;
80
+
pm_power_off = ip27_machine_power_off;
82
81
}
+2
-1
arch/mips/sgi-ip32/ip32-reset.c
+2
-1
arch/mips/sgi-ip32/ip32-reset.c
···
15
15
#include <linux/delay.h>
16
16
#include <linux/ds17287rtc.h>
17
17
#include <linux/interrupt.h>
18
+
#include <linux/pm.h>
18
19
19
20
#include <asm/addrspace.h>
20
21
#include <asm/irq.h>
···
189
188
190
189
_machine_restart = ip32_machine_restart;
191
190
_machine_halt = ip32_machine_halt;
192
-
_machine_power_off = ip32_machine_power_off;
191
+
pm_power_off = ip32_machine_power_off;
193
192
194
193
init_timer(&blink_timer);
195
194
blink_timer.function = blink_timeout;
+2
-1
arch/mips/sibyte/cfe/setup.c
+2
-1
arch/mips/sibyte/cfe/setup.c
···
23
23
#include <linux/mm.h>
24
24
#include <linux/blkdev.h>
25
25
#include <linux/bootmem.h>
26
+
#include <linux/pm.h>
26
27
#include <linux/smp.h>
27
28
28
29
#include <asm/bootinfo.h>
···
249
248
250
249
_machine_restart = cfe_linux_restart;
251
250
_machine_halt = cfe_linux_halt;
252
-
_machine_power_off = cfe_linux_halt;
251
+
pm_power_off = cfe_linux_halt;
253
252
254
253
/*
255
254
* Check if a loader was used; if NOT, the 4 arguments are
+2
-1
arch/mips/sibyte/sb1250/prom.c
+2
-1
arch/mips/sibyte/sb1250/prom.c
···
24
24
#include <linux/bootmem.h>
25
25
#include <linux/smp.h>
26
26
#include <linux/initrd.h>
27
+
#include <linux/pm.h>
27
28
28
29
#include <asm/bootinfo.h>
29
30
#include <asm/reboot.h>
···
80
79
{
81
80
_machine_restart = (void (*)(char *))prom_linux_exit;
82
81
_machine_halt = prom_linux_exit;
83
-
_machine_power_off = prom_linux_exit;
82
+
pm_power_off = prom_linux_exit;
84
83
85
84
strcpy(arcs_cmdline, "root=/dev/ram0 ");
86
85
+3
-2
arch/mips/sni/setup.c
+3
-2
arch/mips/sni/setup.c
···
5
5
* License. See the file "COPYING" in the main directory of this archive
6
6
* for more details.
7
7
*
8
-
* Copyright (C) 1996, 97, 98, 2000, 03, 04 Ralf Baechle (ralf@linux-mips.org)
8
+
* Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org)
9
9
*/
10
10
#include <linux/config.h>
11
11
#include <linux/eisa.h>
···
15
15
#include <linux/init.h>
16
16
#include <linux/interrupt.h>
17
17
#include <linux/mc146818rtc.h>
18
+
#include <linux/pm.h>
18
19
#include <linux/pci.h>
19
20
#include <linux/console.h>
20
21
#include <linux/fb.h>
···
190
189
191
190
_machine_restart = sni_machine_restart;
192
191
_machine_halt = sni_machine_halt;
193
-
_machine_power_off = sni_machine_power_off;
192
+
pm_power_off = sni_machine_power_off;
194
193
195
194
sni_display_setup();
196
195
+3
-1
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+3
-1
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
···
53
53
#include <linux/interrupt.h>
54
54
#include <linux/pci.h>
55
55
#include <linux/timex.h>
56
+
#include <linux/pm.h>
57
+
56
58
#include <asm/bootinfo.h>
57
59
#include <asm/page.h>
58
60
#include <asm/io.h>
···
816
814
":ResetRoutines\n");
817
815
_machine_restart = toshiba_rbtx4927_restart;
818
816
_machine_halt = toshiba_rbtx4927_halt;
819
-
_machine_power_off = toshiba_rbtx4927_power_off;
817
+
pm_power_off = toshiba_rbtx4927_power_off;
820
818
821
819
#ifdef CONFIG_PCI
822
820
+3
-1
arch/mips/tx4938/toshiba_rbtx4938/setup.c
+3
-1
arch/mips/tx4938/toshiba_rbtx4938/setup.c
···
20
20
#include <linux/interrupt.h>
21
21
#include <linux/console.h>
22
22
#include <linux/pci.h>
23
+
#include <linux/pm.h>
24
+
23
25
#include <asm/wbflush.h>
24
26
#include <asm/reboot.h>
25
27
#include <asm/irq.h>
···
1005
1003
1006
1004
_machine_restart = rbtx4938_machine_restart;
1007
1005
_machine_halt = rbtx4938_machine_halt;
1008
-
_machine_power_off = rbtx4938_machine_power_off;
1006
+
pm_power_off = rbtx4938_machine_power_off;
1009
1007
1010
1008
*rbtx4938_led_ptr = 0xff;
1011
1009
printk("RBTX4938 --- FPGA(Rev %02x)", *rbtx4938_fpga_rev_ptr);
+2
-1
arch/mips/vr41xx/common/pmu.c
+2
-1
arch/mips/vr41xx/common/pmu.c
···
21
21
#include <linux/init.h>
22
22
#include <linux/ioport.h>
23
23
#include <linux/kernel.h>
24
+
#include <linux/pm.h>
24
25
#include <linux/smp.h>
25
26
#include <linux/types.h>
26
27
···
115
114
116
115
_machine_restart = vr41xx_restart;
117
116
_machine_halt = vr41xx_halt;
118
-
_machine_power_off = vr41xx_power_off;
117
+
pm_power_off = vr41xx_power_off;
119
118
120
119
return 0;
121
120
}
+1
-2
include/asm-mips/reboot.h
+1
-2
include/asm-mips/reboot.h
···
3
3
* License. See the file "COPYING" in the main directory of this archive
4
4
* for more details.
5
5
*
6
-
* Copyright (C) 1997, 1999, 2001 by Ralf Baechle
6
+
* Copyright (C) 1997, 1999, 2001, 06 by Ralf Baechle
7
7
* Copyright (C) 2001 MIPS Technologies, Inc.
8
8
*/
9
9
#ifndef _ASM_REBOOT_H
···
11
11
12
12
extern void (*_machine_restart)(char *command);
13
13
extern void (*_machine_halt)(void);
14
-
extern void (*_machine_power_off)(void);
15
14
16
15
#endif /* _ASM_REBOOT_H */