diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 11:16:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 11:16:57 -0500 |
| commit | 7e4e574c391cdeef516411eb698ac6955f01d673 (patch) | |
| tree | e9f3b05c464b82be608cef1a90688dd3719e1537 /include/asm-powerpc/rtas.h | |
| parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
| parent | 97b1b999748d3cde6a3f381e0839e0f1082323e6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/rtas.h')
| -rw-r--r-- | include/asm-powerpc/rtas.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/rtas.h b/include/asm-powerpc/rtas.h index 3428889e27b7..f43c6835e62a 100644 --- a/include/asm-powerpc/rtas.h +++ b/include/asm-powerpc/rtas.h | |||
| @@ -161,7 +161,6 @@ extern struct rtas_t rtas; | |||
| 161 | extern void enter_rtas(unsigned long); | 161 | extern void enter_rtas(unsigned long); |
| 162 | extern int rtas_token(const char *service); | 162 | extern int rtas_token(const char *service); |
| 163 | extern int rtas_call(int token, int, int, int *, ...); | 163 | extern int rtas_call(int token, int, int, int *, ...); |
| 164 | extern void call_rtas_display_status(unsigned char); | ||
| 165 | extern void rtas_restart(char *cmd); | 164 | extern void rtas_restart(char *cmd); |
| 166 | extern void rtas_power_off(void); | 165 | extern void rtas_power_off(void); |
| 167 | extern void rtas_halt(void); | 166 | extern void rtas_halt(void); |