diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-25 07:42:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-25 07:42:22 -0700 |
| commit | cf025109e879294f4c6aecf94de1e7b592a9fb07 (patch) | |
| tree | 05758cc7548b82c3b5d5641439f2a20480475bb1 /kernel/panic.c | |
| parent | edec231a8a652384cb6d61e648338aa5155f2b72 (diff) | |
| parent | 9a59c1860d01b3dea9ab01d5cefb9d5c52042e6d (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 0fa3f3a66fb..081f7465fc8 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -102,9 +102,9 @@ NORET_TYPE void panic(const char * fmt, ...) #ifdef __sparc__ { extern int stop_a_enabled; - /* Make sure the user can actually press L1-A */ + /* Make sure the user can actually press Stop-A (L1-A) */ stop_a_enabled = 1; - printk(KERN_EMERG "Press L1-A to return to the boot prom\n"); + printk(KERN_EMERG "Press Stop-A (L1-A) to return to the boot prom\n"); } #endif #if defined(CONFIG_ARCH_S390) |