diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /arch/mips/kernel/reset.c | |
parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/mips/kernel/reset.c')
-rw-r--r-- | arch/mips/kernel/reset.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c index 7e0a9821931a..ae2ba67b7ef6 100644 --- a/arch/mips/kernel/reset.c +++ b/arch/mips/kernel/reset.c | |||
@@ -26,18 +26,13 @@ void machine_restart(char *command) | |||
26 | _machine_restart(command); | 26 | _machine_restart(command); |
27 | } | 27 | } |
28 | 28 | ||
29 | EXPORT_SYMBOL(machine_restart); | ||
30 | |||
31 | void machine_halt(void) | 29 | void machine_halt(void) |
32 | { | 30 | { |
33 | _machine_halt(); | 31 | _machine_halt(); |
34 | } | 32 | } |
35 | 33 | ||
36 | EXPORT_SYMBOL(machine_halt); | ||
37 | |||
38 | void machine_power_off(void) | 34 | void machine_power_off(void) |
39 | { | 35 | { |
40 | _machine_power_off(); | 36 | _machine_power_off(); |
41 | } | 37 | } |
42 | 38 | ||
43 | EXPORT_SYMBOL(machine_power_off); | ||