aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/rtas.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-03 08:23:58 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-03 08:23:58 -0800
commitf589b86d4b6e067b720a253bdb40896857804037 (patch)
treea0eaff20e2d43b424d4c760ff227b4a47f602044 /include/asm-powerpc/rtas.h
parentc8b1ef88d09961078d3c685fcdc1d1659db05231 (diff)
parentb80fa3cce7390185e43ea22e9b3c38ab138bc580 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc Revert "[POWERPC] Fix RTAS os-term usage on kernel panic"
Diffstat (limited to 'include/asm-powerpc/rtas.h')
-rw-r--r--include/asm-powerpc/rtas.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/rtas.h b/include/asm-powerpc/rtas.h
index 87db8728e82d..8eaa7b28d9d0 100644
--- a/include/asm-powerpc/rtas.h
+++ b/include/asm-powerpc/rtas.h
@@ -164,8 +164,7 @@ extern int rtas_call(int token, int, int, int *, ...);
extern void rtas_restart(char *cmd);
extern void rtas_power_off(void);
extern void rtas_halt(void);
-extern void rtas_panic_msg(char *str);
-extern void rtas_os_term(void);
+extern void rtas_os_term(char *str);
extern int rtas_get_sensor(int sensor, int index, int *state);
extern int rtas_get_power_level(int powerdomain, int *level);
extern int rtas_set_power_level(int powerdomain, int level, int *setlevel);

Privacy Policy