diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-27 13:36:54 -0400 |
commit | c2834cf4746cf13501efc3489b1895bce58a4ccb (patch) | |
tree | 13614c2ed7ec156d8518fd5bff4e1c252fb05792 /arch/um | |
parent | 05cb784c81a0fd1f97732156ea464bd392ce875a (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/kernel/reboot.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c index fcec51da1d37..a637e885c583 100644 --- a/arch/um/kernel/reboot.c +++ b/arch/um/kernel/reboot.c | |||
@@ -49,23 +49,17 @@ void machine_restart(char * __unused) | |||
49 | CHOOSE_MODE(reboot_tt(), reboot_skas()); | 49 | CHOOSE_MODE(reboot_tt(), reboot_skas()); |
50 | } | 50 | } |
51 | 51 | ||
52 | EXPORT_SYMBOL(machine_restart); | ||
53 | |||
54 | void machine_power_off(void) | 52 | void machine_power_off(void) |
55 | { | 53 | { |
56 | uml_cleanup(); | 54 | uml_cleanup(); |
57 | CHOOSE_MODE(halt_tt(), halt_skas()); | 55 | CHOOSE_MODE(halt_tt(), halt_skas()); |
58 | } | 56 | } |
59 | 57 | ||
60 | EXPORT_SYMBOL(machine_power_off); | ||
61 | |||
62 | void machine_halt(void) | 58 | void machine_halt(void) |
63 | { | 59 | { |
64 | machine_power_off(); | 60 | machine_power_off(); |
65 | } | 61 | } |
66 | 62 | ||
67 | EXPORT_SYMBOL(machine_halt); | ||
68 | |||
69 | /* | 63 | /* |
70 | * Overrides for Emacs so that we follow Linus's tabbing style. | 64 | * Overrides for Emacs so that we follow Linus's tabbing style. |
71 | * Emacs will notice this stuff at the end of the file and automatically | 65 | * Emacs will notice this stuff at the end of the file and automatically |