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/m32r/kernel/process.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/m32r/kernel/process.c')
-rw-r--r-- | arch/m32r/kernel/process.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index b556c3cf6495..ea13a8f4d8b0 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
@@ -115,8 +115,6 @@ void machine_restart(char *__unused) | |||
115 | cpu_relax(); | 115 | cpu_relax(); |
116 | } | 116 | } |
117 | 117 | ||
118 | EXPORT_SYMBOL(machine_restart); | ||
119 | |||
120 | void machine_halt(void) | 118 | void machine_halt(void) |
121 | { | 119 | { |
122 | printk("Please push reset button!\n"); | 120 | printk("Please push reset button!\n"); |
@@ -124,15 +122,11 @@ void machine_halt(void) | |||
124 | cpu_relax(); | 122 | cpu_relax(); |
125 | } | 123 | } |
126 | 124 | ||
127 | EXPORT_SYMBOL(machine_halt); | ||
128 | |||
129 | void machine_power_off(void) | 125 | void machine_power_off(void) |
130 | { | 126 | { |
131 | /* M32R_FIXME */ | 127 | /* M32R_FIXME */ |
132 | } | 128 | } |
133 | 129 | ||
134 | EXPORT_SYMBOL(machine_power_off); | ||
135 | |||
136 | static int __init idle_setup (char *str) | 130 | static int __init idle_setup (char *str) |
137 | { | 131 | { |
138 | if (!strncmp(str, "poll", 4)) { | 132 | if (!strncmp(str, "poll", 4)) { |