diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 10:10:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 10:10:09 -0800 |
| commit | e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4 (patch) | |
| tree | 0515ffe68d9a88eda2d16f45e6391b05475fd9d1 /include/asm-mips/reboot.h | |
| parent | e1a8e6c9b757c09249ab29fc6da12d9ab64567e1 (diff) | |
| parent | b38c73995f63fe205c0068cb0ce3131895244068 (diff) | |
| download | kernel-crypto-e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4.tar.gz kernel-crypto-e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4.tar.xz kernel-crypto-e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/reboot.h')
| -rw-r--r-- | include/asm-mips/reboot.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-mips/reboot.h b/include/asm-mips/reboot.h index 2f10ebcbe14..e48c0bfab25 100644 --- a/include/asm-mips/reboot.h +++ b/include/asm-mips/reboot.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 1997, 1999, 2001 by Ralf Baechle + * Copyright (C) 1997, 1999, 2001, 06 by Ralf Baechle * Copyright (C) 2001 MIPS Technologies, Inc. */ #ifndef _ASM_REBOOT_H @@ -11,6 +11,5 @@ extern void (*_machine_restart)(char *command); extern void (*_machine_halt)(void); -extern void (*_machine_power_off)(void); #endif /* _ASM_REBOOT_H */ |